Merge branch 'PHP-8.4'

* PHP-8.4:
  Save opline in zend_jit_hot_func()
This commit is contained in:
Arnaud Le Blanc 2025-04-15 14:11:53 +02:00
commit 49891d89fc
No known key found for this signature in database

View file

@ -3171,6 +3171,10 @@ void ZEND_FASTCALL zend_jit_hot_func(zend_execute_data *execute_data, const zend
op_array->opcodes[i].handler = jit_extension->orig_handlers[i]; op_array->opcodes[i].handler = jit_extension->orig_handlers[i];
} }
#ifdef HAVE_GCC_GLOBAL_REGS
EX(opline) = opline;
#endif
/* perform real JIT for this function */ /* perform real JIT for this function */
zend_real_jit_func(op_array, NULL, opline, ZEND_JIT_ON_HOT_COUNTERS); zend_real_jit_func(op_array, NULL, opline, ZEND_JIT_ON_HOT_COUNTERS);
} zend_catch { } zend_catch {