Merge branch 'PHP-8.1'

dstogov · dstogov · commit f0241197188e · 2021-09-23T23:41:35.000+03:00
* PHP-8.1:
  Tracing JIT: Fixed possible incorrect megamorphic call from a trait
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -8988,6 +8988,12 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 		if (call_info && call_info->callee_func && !call_info->is_prototype) {
 			func = call_info->callee_func;
 		}
+		if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)
+		 && JIT_G(current_frame)
+		 && JIT_G(current_frame)->call
+		 && !JIT_G(current_frame)->call->func) {
+			call_info = NULL; func = NULL; /* megamorphic call from trait */
+		}
 	}
 	if (!func) {
 		/* resolve function at run time */
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -9630,6 +9630,12 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 		if (call_info && call_info->callee_func && !call_info->is_prototype) {
 			func = call_info->callee_func;
 		}
+		if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)
+		 && JIT_G(current_frame)
+		 && JIT_G(current_frame)->call
+		 && !JIT_G(current_frame)->call->func) {
+			call_info = NULL; func = NULL; /* megamorphic call from trait */
+		}
 	}
 	if (!func) {
 		/* resolve function at run time */

Original file line number	Diff line number	Diff line change
`@@ -8988,6 +8988,12 @@ static int zend_jit_do_fcall(dasm_State *Dst, const zend_op opline, const zend`
`8988`	`8988`	`if (call_info && call_info->callee_func && !call_info->is_prototype) {`
`8989`	`8989`	`func = call_info->callee_func;`
`8990`	`8990`	`}`
	`8991`	`+ if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)`
	`8992`	`+ && JIT_G(current_frame)`
	`8993`	`+ && JIT_G(current_frame)->call`
	`8994`	`+ && !JIT_G(current_frame)->call->func) {`
	`8995`	`+ call_info = NULL; func = NULL; /* megamorphic call from trait */`
	`8996`	`+ }`
`8991`	`8997`	`}`
`8992`	`8998`	`if (!func) {`
`8993`	`8999`	`/* resolve function at run time */`
Original file line number	Diff line number	Diff line change
`@@ -9630,6 +9630,12 @@ static int zend_jit_do_fcall(dasm_State *Dst, const zend_op opline, const zend`
`9630`	`9630`	`if (call_info && call_info->callee_func && !call_info->is_prototype) {`
`9631`	`9631`	`func = call_info->callee_func;`
`9632`	`9632`	`}`
	`9633`	`+ if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)`
	`9634`	`+ && JIT_G(current_frame)`
	`9635`	`+ && JIT_G(current_frame)->call`
	`9636`	`+ && !JIT_G(current_frame)->call->func) {`
	`9637`	`+ call_info = NULL; func = NULL; /* megamorphic call from trait */`
	`9638`	`+ }`
`9633`	`9639`	`}`
`9634`	`9640`	`if (!func) {`
`9635`	`9641`	`/* resolve function at run time */`