Fix tracing JIT regression

iluuu1994 · iluuu1994 · commit 7135a607f65c · 2024-05-14T19:36:19.000+02:00
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -692,6 +692,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 				}
 			}
 			op1_type |= flags;
+		} else if (opline->op1_type == IS_UNUSED) {
+			uint32_t op1_flags = ZEND_VM_OP1_FLAGS(zend_get_opcode_flags(opline->opcode));
+			if ((op1_flags & ZEND_VM_OP_MASK) == ZEND_VM_OP_THIS) {
+				ce1 = Z_OBJCE(EX(This));
+			}
 		}
 		if (opline->op2_type & (IS_TMP_VAR|IS_VAR|IS_CV)
 		 && opline->opcode != ZEND_INSTANCEOF

Original file line number	Diff line number	Diff line change
`@@ -692,6 +692,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,`
`692`	`692`	`}`
`693`	`693`	`}`
`694`	`694`	`op1_type \|= flags;`
	`695`	`+ } else if (opline->op1_type == IS_UNUSED) {`
	`696`	`+ uint32_t op1_flags = ZEND_VM_OP1_FLAGS(zend_get_opcode_flags(opline->opcode));`
	`697`	`+ if ((op1_flags & ZEND_VM_OP_MASK) == ZEND_VM_OP_THIS) {`
	`698`	`+ ce1 = Z_OBJCE(EX(This));`
	`699`	`+ }`
`695`	`700`	`}`
`696`	`701`	`if (opline->op2_type & (IS_TMP_VAR\|IS_VAR\|IS_CV)`
`697`	`702`	`&& opline->opcode != ZEND_INSTANCEOF`