Fixed tracing JIT for RETRUN $undefined_cv

dstogov · dstogov · commit 0386cbb95c40 · 2020-05-25T22:19:13.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -3309,7 +3309,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						 || !op_array->function_name
 						 // TODO: support for IS_UNDEF ???
 						 || (op1_info & MAY_BE_UNDEF)) {
-							if (!zend_jit_tail_handler(&dasm_state, opline)) {
+							if (!zend_jit_trace_handler(&dasm_state, op_array, opline, zend_may_throw(opline, ssa_op, op_array, ssa), p + 1)) {
 								goto jit_failure;
 							}
 						} else {

Original file line number	Diff line number	Diff line change
`@@ -3309,7 +3309,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`3309`	`3309`	`\|\| !op_array->function_name`
`3310`	`3310`	`// TODO: support for IS_UNDEF ???`
`3311`	`3311`	`\|\| (op1_info & MAY_BE_UNDEF)) {`
`3312`		`- if (!zend_jit_tail_handler(&dasm_state, opline)) {`
	`3312`	`+ if (!zend_jit_trace_handler(&dasm_state, op_array, opline, zend_may_throw(opline, ssa_op, op_array, ssa), p + 1)) {`
`3313`	`3313`	`goto jit_failure;`
`3314`	`3314`	`}`
`3315`	`3315`	`} else {`