Try fixing JIT issues?

bwoebi · bwoebi · commit ddd1a8f1c8a3 · 2024-05-25T19:03:54.000+02:00
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -17087,7 +17087,11 @@ static ir_ref jit_frameless_observer(zend_jit_ctx *jit, int checked_stack, const
 			uint32_t offset = EX_NUM_TO_VAR(i);
 			zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, offset);
 
+			// JIT_G(current_frame) is untouched for frameless calls. We'll have to NULL it so that it's not considered here.
+			zend_jit_trace_stack_frame *jit_current_frame = JIT_G(current_frame);
+			JIT_G(current_frame) = NULL;
 			jit_ZVAL_PTR_DTOR(jit, var_addr, MAY_BE_ANY|MAY_BE_RC1|MAY_BE_RCN, 0, opline);
+			JIT_G(current_frame) = jit_current_frame;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -17087,7 +17087,11 @@ static ir_ref jit_frameless_observer(zend_jit_ctx *jit, int checked_stack, const`
`17087`	`17087`	`uint32_t offset = EX_NUM_TO_VAR(i);`
`17088`	`17088`	`zend_jit_addr var_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, offset);`
`17089`	`17089`
	`17090`	`+ // JIT_G(current_frame) is untouched for frameless calls. We'll have to NULL it so that it's not considered here.`
	`17091`	`+ zend_jit_trace_stack_frame *jit_current_frame = JIT_G(current_frame);`
	`17092`	`+ JIT_G(current_frame) = NULL;`
`17090`	`17093`	`jit_ZVAL_PTR_DTOR(jit, var_addr, MAY_BE_ANY\|MAY_BE_RC1\|MAY_BE_RCN, 0, opline);`
	`17094`	`+ JIT_G(current_frame) = jit_current_frame;`
`17091`	`17095`	`}`
`17092`	`17096`	`}`
`17093`	`17097`