Skip to content

Commit 918332c

Browse files
committed
Fix Symfony tests failures with function JIT
1 parent 01a894a commit 918332c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/opcache/jit/zend_jit_ir.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9250,7 +9250,7 @@ static int zend_jit_init_static_method_call(zend_jit_ctx *jit,
92509250
}
92519251

92529252
ce = zend_get_known_class(op_array, opline, opline->op1_type, opline->op1);
9253-
if (!func && ce) {
9253+
if (!func && ce && (opline->op1_type == IS_CONST || !(ce->ce_flags & ZEND_ACC_TRAIT))) {
92549254
zval *zv = RT_CONSTANT(opline, opline->op2);
92559255
zend_string *method_name;
92569256

@@ -16034,7 +16034,7 @@ static int zend_jit_fetch_static_prop(zend_jit_ctx *jit, const zend_op *opline,
1603416034
zend_class_entry *ce;
1603516035

1603616036
ce = zend_get_known_class(op_array, opline, opline->op2_type, opline->op2);
16037-
if (ce) {
16037+
if (ce && (opline->op2_type == IS_CONST || !(ce->ce_flags & ZEND_ACC_TRAIT))) {
1603816038
zval *zv = RT_CONSTANT(opline, opline->op1);
1603916039
zend_string *prop_name;
1604016040

0 commit comments

Comments
 (0)