Skip to content

Instantly share code, notes, and snippets.

@dstogov

dstogov/interrupt-01.diff

Created June 6, 2023 10:04
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dstogov/c540522e520f01f6dd3896e3bed84a0b to your computer and use it in GitHub Desktop.
Save dstogov/c540522e520f01f6dd3896e3bed84a0b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
interrupt-01.diff
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index b1fbc7b651..e2a7e599d7 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -6823,7 +6823,8 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
if (!(t->flags & ZEND_JIT_TRACE_USES_INITIAL_IP)
|| (ra
&& zend_jit_trace_stack_needs_deoptimization(stack, op_array->last_var + op_array->T))) {
- uint32_t exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);
+ /* Deoptimize to the first instruction of the loop */
+ uint32_t exit_point = zend_jit_trace_get_exit_point(trace_buffer[1].opline, ZEND_JIT_EXIT_TO_VM);
timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
if (!timeout_exit_addr) {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment