JIT: Avoid ZEND_CALL_RELEASE_THIS checks

Author: dstogov

ext/opcache/jit/zend_jit_arm64.dasc

@@ -10670,9 +10670,11 @@ static int zend_jit_leave_func(dasm_State          **Dst,
 				return 0;
 		    }
 		}
-		|	// if (call_info & ZEND_CALL_RELEASE_THIS)
-		|	TST_32_WITH_CONST FCARG1w, ZEND_CALL_RELEASE_THIS, TMP1w
-		|	beq >4
+		if (!JIT_G(current_frame) || !TRACE_FRAME_ALWAYS_RELEASE_THIS(JIT_G(current_frame))) {
+			|	// if (call_info & ZEND_CALL_RELEASE_THIS)
+			|	TST_32_WITH_CONST FCARG1w, ZEND_CALL_RELEASE_THIS, TMP1w
+			|	beq >4
+		}
 		|	// zend_object *object = Z_OBJ(execute_data->This);
 		|	ldr FCARG1x, EX->This.value.obj
 		|	// OBJ_RELEASE(object);

ext/opcache/jit/zend_jit_internal.h

@@ -614,6 +614,7 @@ struct _zend_jit_trace_stack_frame {
 #define TRACE_FRAME_MASK_NO_NEED_RELEASE_THIS 0x00000080
 #define TRACE_FRAME_MASK_THIS_CLASS_CHECKED   0x00000100
 #define TRACE_FRAME_MASK_CLOSURE_CALL         0x00000200
+#define TRACE_FRAME_MASK_ALWAYS_RELEASE_THIS  0x00000400
 
 
 #define TRACE_FRAME_INIT(frame, _func, _flags, num_args) do { \
@@ -651,6 +652,8 @@ struct _zend_jit_trace_stack_frame {
 	((frame)->_info & TRACE_FRAME_MASK_THIS_CLASS_CHECKED)
 #define TRACE_FRAME_IS_CLOSURE_CALL(frame) \
 	((frame)->_info & TRACE_FRAME_MASK_CLOSURE_CALL)
+#define TRACE_FRAME_ALWAYS_RELEASE_THIS(frame) \
+	((frame)->_info & TRACE_FRAME_MASK_ALWAYS_RELEASE_THIS)
 
 #define TRACE_FRAME_SET_UNKNOWN_NUM_ARGS(frame) do { \
 		(frame)->_info |= (0xffffu << TRACE_FRAME_SHIFT_NUM_ARGS); \
@@ -690,6 +693,9 @@ struct _zend_jit_trace_stack_frame {
 #define TRACE_FRAME_SET_CLOSURE_CALL(frame) do { \
 		(frame)->_info |= TRACE_FRAME_MASK_CLOSURE_CALL; \
 	} while (0)
+#define TRACE_FRAME_SET_ALWAYS_RELEASE_THIS(frame) do { \
+		(frame)->_info |= TRACE_FRAME_MASK_ALWAYS_RELEASE_THIS; \
+	} while (0)
 
 ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_func_trace_helper(ZEND_OPCODE_HANDLER_ARGS);
 ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_ret_trace_helper(ZEND_OPCODE_HANDLER_ARGS);

ext/opcache/jit/zend_jit_trace.c

@@ -6498,16 +6498,25 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 					TRACE_FRAME_SET_CLOSURE_CALL(call);
 				}
 			}
-			if (init_opline
-			 && init_opline->opcode != ZEND_NEW
-			 && (init_opline->opcode != ZEND_INIT_METHOD_CALL
-			  || init_opline->op1_type == IS_UNDEF)
-			 && (init_opline->opcode != ZEND_INIT_USER_CALL
-			  || (p->func && (!p->func->common.scope || (p->func->common.fn_flags & ZEND_ACC_STATIC))))
-			 && (init_opline->opcode != ZEND_INIT_DYNAMIC_CALL
-			  || (p->func && (!p->func->common.scope || (p->func->common.fn_flags & ZEND_ACC_STATIC))))
-			) {
-				TRACE_FRAME_SET_NO_NEED_RELEASE_THIS(call);
+			if (init_opline) {
+				if (init_opline->opcode != ZEND_NEW
+				 && (init_opline->opcode != ZEND_INIT_METHOD_CALL
+				  || init_opline->op1_type == IS_UNDEF
+				  || (!(p->info & ZEND_JIT_TRACE_FAKE_INIT_CALL)
+				   && (ssa_op-1)->op1_use >=0
+				   && ssa->var_info[(ssa_op-1)->op1_use].delayed_fetch_this))
+				 && (init_opline->opcode != ZEND_INIT_USER_CALL
+				  || (p->func && (!p->func->common.scope || (p->func->common.fn_flags & ZEND_ACC_STATIC))))
+				 && (init_opline->opcode != ZEND_INIT_DYNAMIC_CALL
+				  || (p->func && (!p->func->common.scope || (p->func->common.fn_flags & ZEND_ACC_STATIC))))
+				) {
+					TRACE_FRAME_SET_NO_NEED_RELEASE_THIS(call);
+				} else if (init_opline->opcode == ZEND_NEW
+				 || (init_opline->opcode == ZEND_INIT_METHOD_CALL
+				  && init_opline->op1_type != IS_UNDEF
+				  && p->func && p->func->common.scope && !(p->func->common.fn_flags & ZEND_ACC_STATIC))) {
+					TRACE_FRAME_SET_ALWAYS_RELEASE_THIS(call);
+				}
 			}
 			frame->call = call;
 			top = zend_jit_trace_call_frame(top, p->op_array);

ext/opcache/jit/zend_jit_x86.dasc

@@ -11298,9 +11298,11 @@ static int zend_jit_leave_func(dasm_State          **Dst,
 				return 0;
 		    }
 		}
-		|	// if (call_info & ZEND_CALL_RELEASE_THIS)
-		|	test FCARG1d, ZEND_CALL_RELEASE_THIS
-		|	je >4
+		if (!JIT_G(current_frame) || !TRACE_FRAME_ALWAYS_RELEASE_THIS(JIT_G(current_frame))) {
+			|	// if (call_info & ZEND_CALL_RELEASE_THIS)
+			|	test FCARG1d, ZEND_CALL_RELEASE_THIS
+			|	je >4
+		}
 		|	// zend_object *object = Z_OBJ(execute_data->This);
 		|	mov FCARG1a, EX->This.value.obj
 		|	// OBJ_RELEASE(object);