Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 11dd5e6e0869 · 2021-10-20T23:51:04.000+03:00
* PHP-8.0:
  Use right frame
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -491,7 +491,7 @@ static int zend_jit_trace_record_fake_init_call_ex(zend_execute_data *call, zend
 		 && ((ZEND_CALL_INFO(call) & ZEND_CALL_DYNAMIC)
 		  || func->common.scope)) {
 			func = NULL;
-			ZEND_ADD_CALL_FLAG(EX(call), ZEND_CALL_MEGAMORPHIC);
+			ZEND_ADD_CALL_FLAG(call, ZEND_CALL_MEGAMORPHIC);
 		}
 		TRACE_RECORD(ZEND_JIT_TRACE_INIT_CALL, ZEND_JIT_TRACE_FAKE_INFO(init_level), func);
 	} while (0);

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ static int zend_jit_trace_record_fake_init_call_ex(zend_execute_data *call, zend`
`491`	`491`	`&& ((ZEND_CALL_INFO(call) & ZEND_CALL_DYNAMIC)`
`492`	`492`	`\|\| func->common.scope)) {`
`493`	`493`	`func = NULL;`
`494`		`- ZEND_ADD_CALL_FLAG(EX(call), ZEND_CALL_MEGAMORPHIC);`
	`494`	`+ ZEND_ADD_CALL_FLAG(call, ZEND_CALL_MEGAMORPHIC);`
`495`	`495`	`}`
`496`	`496`	`TRACE_RECORD(ZEND_JIT_TRACE_INIT_CALL, ZEND_JIT_TRACE_FAKE_INFO(init_level), func);`
`497`	`497`	`} while (0);`