Tracing JIT: Fixed possible incorrect megamorphic call from a trait

php · Sep 23, 2021 · 3e6919c · 3e6919c
1 parent be82173
commit 3e6919c
Showing 1 changed file with 6 additions and 0 deletions.
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 */