Skip to content

Commit a23e7c1

Browse files
committed
GCC build fix
1 parent 70600f1 commit a23e7c1

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3046,7 +3046,14 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
30463046
/* Run-time JIT handler */
30473047
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_runtime_jit(ZEND_OPCODE_HANDLER_ARGS)
30483048
{
3049+
#if GCC_GLOBAL_REGS
3050+
zend_execute_data *execute_data;
3051+
zend_op *opline;
3052+
#endif
3053+
3054+
execute_data = EG(current_execute_data);
30493055
zend_op_array *op_array = &EX(func)->op_array;
3056+
opline = op_array->opcodes;
30503057
zend_jit_op_array_extension *jit_extension;
30513058
bool do_bailout = 0;
30523059

@@ -3065,7 +3072,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_runtime_jit(ZEND_OPCODE_HANDLE
30653072
}
30663073
}
30673074
jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array);
3068-
((zend_op*)opline)->handler = jit_extension->orig_handler;
3075+
opline->handler = jit_extension->orig_handler;
30693076

30703077
/* perform real JIT for this function */
30713078
zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_FIRST_EXEC);
@@ -3083,11 +3090,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_runtime_jit(ZEND_OPCODE_HANDLE
30833090
zend_bailout();
30843091
}
30853092

3093+
/* JIT-ed code is going to be called by VM */
30863094
#if GCC_GLOBAL_REGS
3087-
opline = op_array->opcodes;
3088-
return;
3095+
return; // ZEND_VM_CONTINUE
30893096
#else
3090-
/* JIT-ed code is going to be called by VM */
30913097
return op_array->opcodes; // ZEND_VM_CONTINUE
30923098
#endif
30933099
}

0 commit comments

Comments
 (0)