Only record for closures

iluuu1994 · iluuu1994 · commit 3ad91c80630a · 2024-05-15T14:09:59.000+02:00
For other functions, $this is trivial to infer.
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -692,9 +692,10 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 				}
 			}
 			op1_type |= flags;
-		} else if (opline->op1_type == IS_UNUSED) {
+		} else if (opline->op1_type == IS_UNUSED && (op_array->fn_flags & ZEND_ACC_CLOSURE)) {
 			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) {
+				op1_flags = IS_OBJECT;
 				ce1 = Z_OBJCE(EX(This));
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -692,9 +692,10 @@ 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) {`
	`695`	`+ } else if (opline->op1_type == IS_UNUSED && (op_array->fn_flags & ZEND_ACC_CLOSURE)) {`
`696`	`696`	`uint32_t op1_flags = ZEND_VM_OP1_FLAGS(zend_get_opcode_flags(opline->opcode));`
`697`	`697`	`if ((op1_flags & ZEND_VM_OP_MASK) == ZEND_VM_OP_THIS) {`
	`698`	`+ op1_flags = IS_OBJECT;`
`698`	`699`	`ce1 = Z_OBJCE(EX(This));`
`699`	`700`	`}`
`700`	`701`	`}`