Tracing JIT: Fixed possible incorrect megamorphic call from a trait

dstogov · dstogov · commit 3e6919cfb3e6 · 2021-09-23T23:38:03.000+03:00
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -9854,6 +9854,12 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 		if (call_info && call_info->callee_func) {
 			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
`@@ -9854,6 +9854,12 @@ static int zend_jit_do_fcall(dasm_State *Dst, const zend_op opline, const zend`
`9854`	`9854`	`if (call_info && call_info->callee_func) {`
`9855`	`9855`	`func = call_info->callee_func;`
`9856`	`9856`	`}`
	`9857`	`+ if ((op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)`
	`9858`	`+ && JIT_G(current_frame)`
	`9859`	`+ && JIT_G(current_frame)->call`
	`9860`	`+ && !JIT_G(current_frame)->call->func) {`
	`9861`	`+ call_info = NULL; func = NULL; /* megamorphic call from trait */`
	`9862`	`+ }`
`9857`	`9863`	`}`
`9858`	`9864`	`if (!func) {`
`9859`	`9865`	`/* resolve function at run time */`