Skip to content

Commit 7f860b9

Browse files
committed
Fix some jit instructions
1 parent 2d9a47c commit 7f860b9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ext/opcache/jit/zend_jit_ir.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8345,9 +8345,9 @@ static int zend_jit_push_call_frame(zend_jit_ctx *jit, const zend_op *opline, co
83458345
// JIT: call_info = ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_DYNAMIC | ZEND_CALL_CLOSURE |
83468346
// (closure->func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE);
83478347
call_info = ir_OR_U32(
8348-
ir_AND_U32(
8348+
ir_AND_U64(
83498349
ir_LOAD_U64(ir_ADD_OFFSET(func_ref, offsetof(zend_closure, func.common.fn_flags))),
8350-
ir_CONST_U32(ZEND_ACC_FAKE_CLOSURE)),
8350+
ir_CONST_U64(ZEND_ACC_FAKE_CLOSURE)),
83518351
ir_CONST_U32(ZEND_CALL_NESTED_FUNCTION | ZEND_CALL_DYNAMIC | ZEND_CALL_CLOSURE));
83528352
// JIT: if (Z_TYPE(closure->this_ptr) != IS_UNDEF) {
83538353
if_cond = ir_IF(ir_LOAD_U8(ir_ADD_OFFSET(func_ref, offsetof(zend_closure, this_ptr.u1.v.type))));
@@ -8791,9 +8791,9 @@ static int zend_jit_init_method_call(zend_jit_ctx *jit,
87918791

87928792
if (!func) {
87938793
// JIT: if (fbc->common.fn_flags & ZEND_ACC_STATIC) {
8794-
if_static = ir_IF(ir_AND_U32(
8794+
if_static = ir_IF(ir_AND_U64(
87958795
ir_LOAD_U64(ir_ADD_OFFSET(func_ref, offsetof(zend_function, common.fn_flags))),
8796-
ir_CONST_U32(ZEND_ACC_STATIC)));
8796+
ir_CONST_U64(ZEND_ACC_STATIC)));
87978797
ir_IF_TRUE_cold(if_static);
87988798
}
87998799

@@ -9592,9 +9592,9 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
95929592

95939593
func_ref = ir_LOAD_A(jit_CALL(rx, func));
95949594
ir_GUARD_NOT(
9595-
ir_AND_U32(
9595+
ir_AND_U64(
95969596
ir_LOAD_U64(ir_ADD_OFFSET(func_ref, offsetof(zend_op_array, fn_flags))),
9597-
ir_CONST_U32(ZEND_ACC_DEPRECATED)),
9597+
ir_CONST_U64(ZEND_ACC_DEPRECATED)),
95989598
ir_CONST_ADDR(exit_addr));
95999599
}
96009600
}

0 commit comments

Comments
 (0)