Simplify zend_frameless_observed_call calling

Author: test@test.test

Zend/zend_execute.c

@@ -1540,11 +1540,11 @@ static zend_never_inline void zend_assign_to_object_dim(zend_object *obj, zval *
 	}
 }
 
-ZEND_API void zend_frameless_observed_call(EXECUTE_DATA_D OPLINE_DC)
+ZEND_API void zend_frameless_observed_call(zend_execute_data *execute_data)
 {
+	const zend_op *opline = EX(opline);
 	uint8_t num_args = ZEND_FLF_NUM_ARGS(opline->opcode);
 	zend_function *fbc = ZEND_FLF_FUNC(opline);
-
 	zval *result = EX_VAR(opline->result.var);
 
 	zend_execute_data *call = zend_vm_stack_push_call_frame_ex(zend_vm_calc_used_stack(num_args, fbc), ZEND_CALL_NESTED_FUNCTION, fbc, num_args, NULL);

Zend/zend_execute.h

@@ -430,6 +430,8 @@ ZEND_API void zend_cleanup_unfinished_execution(zend_execute_data *execute_data,
 ZEND_API ZEND_ATTRIBUTE_DEPRECATED HashTable *zend_unfinished_execution_gc(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer);
 ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield);
 
+ZEND_API void zend_frameless_observed_call(zend_execute_data *execute_data);
+
 zval * ZEND_FASTCALL zend_handle_named_arg(
 		zend_execute_data **call_ptr, zend_string *arg_name,
 		uint32_t *arg_num_ptr, void **cache_slot);

Zend/zend_vm_def.h

@@ -9609,7 +9609,7 @@ ZEND_VM_HANDLER(204, ZEND_FRAMELESS_ICALL_0, UNUSED, UNUSED, SPEC(OBSERVER))
 
 #if !ZEND_VM_SPEC || ZEND_OBSERVER_ENABLED
 	if (ZEND_OBSERVER_ENABLED && UNEXPECTED(zend_observer_handler_is_unobserved(ZEND_OBSERVER_DATA(ZEND_FLF_FUNC(opline))) == false)) {
-		zend_frameless_observed_call(EXECUTE_DATA_C OPLINE_CC);
+		zend_frameless_observed_call(execute_data);
 	} else
 #endif
 	{
@@ -9634,7 +9634,7 @@ ZEND_VM_HANDLER(205, ZEND_FRAMELESS_ICALL_1, ANY, UNUSED, SPEC(OBSERVER))
 
 #if !ZEND_VM_SPEC || ZEND_OBSERVER_ENABLED
 	if (ZEND_OBSERVER_ENABLED && UNEXPECTED(zend_observer_handler_is_unobserved(ZEND_OBSERVER_DATA(ZEND_FLF_FUNC(opline))) == false)) {
-		zend_frameless_observed_call(EXECUTE_DATA_C OPLINE_CC);
+		zend_frameless_observed_call(execute_data);
 	} else
 #endif
 	{
@@ -9662,7 +9662,7 @@ ZEND_VM_HANDLER(206, ZEND_FRAMELESS_ICALL_2, ANY, ANY, SPEC(OBSERVER))
 
 #if !ZEND_VM_SPEC || ZEND_OBSERVER_ENABLED
 	if (ZEND_OBSERVER_ENABLED && UNEXPECTED(zend_observer_handler_is_unobserved(ZEND_OBSERVER_DATA(ZEND_FLF_FUNC(opline))) == false)) {
-		zend_frameless_observed_call(EXECUTE_DATA_C OPLINE_CC);
+		zend_frameless_observed_call(execute_data);
 	} else
 #endif
 	{
@@ -9698,7 +9698,7 @@ ZEND_VM_HANDLER(207, ZEND_FRAMELESS_ICALL_3, ANY, ANY, SPEC(OBSERVER))
 
 #if !ZEND_VM_SPEC || ZEND_OBSERVER_ENABLED
 	if (ZEND_OBSERVER_ENABLED && UNEXPECTED(zend_observer_handler_is_unobserved(ZEND_OBSERVER_DATA(ZEND_FLF_FUNC(opline))) == false)) {
-		zend_frameless_observed_call(EXECUTE_DATA_C OPLINE_CC);
+		zend_frameless_observed_call(execute_data);
 	} else
 #endif
 	{

Zend/zend_vm_execute.h

@@ -17058,7 +17058,6 @@ static bool zend_jit_may_be_in_reg(const zend_op_array *op_array, zend_ssa *ssa,
 	return 1;
 }
 
-void zend_frameless_observed_call(void); // we just care about the symbol to use it here, IP and FP may need to be passed depending on global regs
 static ir_ref jit_frameless_observer(zend_jit_ctx *jit, const zend_op *opline) {
 	// JIT: zend_observer_handler_is_unobserved(ZEND_OBSERVER_DATA(fbc))
 	ir_ref observer_handler;
@@ -17067,15 +17066,7 @@ static ir_ref jit_frameless_observer(zend_jit_ctx *jit, const zend_op *opline) {
 	ir_ref if_unobserved = jit_observer_fcall_is_unobserved_start(jit, fbc, &observer_handler, IR_UNUSED, IR_UNUSED).if_unobserved;
 
 	// Call zend_frameless_observed_call for the main logic. 
-	if (GCC_GLOBAL_REGS) {
-		// FP register will point to the right place, but zend_frameless_observed_call needs IP to be also pointing to the precise opline.
-		ir_ref old_ip = ir_HARD_COPY_A(ir_RLOAD_A(ZREG_IP));
-		ir_RSTORE(ZREG_IP, ir_CONST_ADDR(opline));
-		ir_CALL(IR_VOID, ir_CONST_ADDR((size_t)zend_frameless_observed_call));
-		ir_RSTORE(ZREG_IP, old_ip); // restore it so that further offset calculations are not wrong
-	} else {
-		ir_CALL_2(IR_VOID, ir_CONST_ADDR((size_t)zend_frameless_observed_call), jit_FP(jit), ir_CONST_ADDR(opline));
-	}
+	ir_CALL_1(IR_VOID, ir_CONST_ADDR((size_t)zend_frameless_observed_call), jit_FP(jit));
 
 	ir_ref skip = ir_END();
 	ir_IF_TRUE(if_unobserved);