Stop on fake frame

dstogov · dstogov · commit de359c00b414 · 2020-11-11T14:54:54.000+03:00
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -406,7 +406,7 @@ static int zend_jit_trace_recursive_ret_count(const zend_op_array *op_array, con
 
 static int zend_jit_trace_has_recursive_ret(zend_execute_data *ex, const zend_op_array *orig_op_array, const zend_op *orig_opline, int ret_level)
 {
-	while (ex != NULL && ret_level < ZEND_JIT_TRACE_MAX_RET_DEPTH) {
+	while (ex != NULL && ex->func != NULL && ret_level < ZEND_JIT_TRACE_MAX_RET_DEPTH) {
 		if (&ex->func->op_array == orig_op_array && ex->opline + 1 == orig_opline) {
 			return 1;
 		}

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ static int zend_jit_trace_recursive_ret_count(const zend_op_array *op_array, con`
`406`	`406`
`407`	`407`	`static int zend_jit_trace_has_recursive_ret(zend_execute_data ex, const zend_op_array orig_op_array, const zend_op *orig_opline, int ret_level)`
`408`	`408`	`{`
`409`		`- while (ex != NULL && ret_level < ZEND_JIT_TRACE_MAX_RET_DEPTH) {`
	`409`	`+ while (ex != NULL && ex->func != NULL && ret_level < ZEND_JIT_TRACE_MAX_RET_DEPTH) {`
`410`	`410`	`if (&ex->func->op_array == orig_op_array && ex->opline + 1 == orig_opline) {`
`411`	`411`	`return 1;`
`412`	`412`	`}`