remove ZEND_SIMPLE_INTERRUPT_CHECK

Author: morrisonlevi

Zend/zend_execute.c

@@ -4056,16 +4056,6 @@ ZEND_API void ZEND_FASTCALL zend_free_compiled_variables(zend_execute_data *exec
 }
 /* }}} */
 
-#define ZEND_SIMPLE_INTERRUPT_CHECK(execute_data) do { \
-		if (UNEXPECTED(zend_atomic_bool_load_ex(&EG(vm_interrupt)))) { \
-			if (zend_atomic_bool_load_ex(&EG(timed_out))) { \
-				zend_timeout(); \
-			} else if (zend_interrupt_function) { \
-				zend_interrupt_function(execute_data); \
-			} \
-		} \
-	} while (0)
-
 #define ZEND_VM_INTERRUPT_CHECK() do { \
 		if (UNEXPECTED(zend_atomic_bool_load_ex(&EG(vm_interrupt)))) { \
 			ZEND_VM_INTERRUPT(); \

Zend/zend_vm_def.h

@@ -4074,7 +4074,6 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
 	}
 #endif
 	ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
-	ZEND_SIMPLE_INTERRUPT_CHECK(call);
 
 	EG(current_execute_data) = execute_data;
 	zend_vm_stack_free_args(call);
@@ -4198,7 +4197,6 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		}
 #endif
 		ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
-		ZEND_SIMPLE_INTERRUPT_CHECK(call);
 
 		EG(current_execute_data) = execute_data;
 
@@ -4320,7 +4318,6 @@ ZEND_VM_HOT_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		}
 #endif
 		ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
-		ZEND_SIMPLE_INTERRUPT_CHECK(call);
 
 		EG(current_execute_data) = execute_data;
 
@@ -4504,7 +4501,6 @@ ZEND_VM_INLINE_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY, SPEC(OBSERVER))
 	}
 	ZEND_OBSERVER_SAVE_OPLINE();
 	ZEND_OBSERVER_FCALL_END(execute_data, return_value);
-	ZEND_SIMPLE_INTERRUPT_CHECK(execute_data);
 	ZEND_OBSERVER_FREE_RETVAL();
 	ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
 }
@@ -4571,7 +4567,6 @@ ZEND_VM_COLD_CONST_HANDLER(111, ZEND_RETURN_BY_REF, CONST|TMP|VAR|CV, ANY, SRC,
 	} while (0);
 
 	ZEND_OBSERVER_FCALL_END(execute_data, return_value);
-	ZEND_SIMPLE_INTERRUPT_CHECK(execute_data);
 	ZEND_OBSERVER_FREE_RETVAL();
 	ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
 }
@@ -4691,7 +4686,6 @@ ZEND_VM_HANDLER(161, ZEND_GENERATOR_RETURN, CONST|TMP|VAR|CV, ANY, SPEC(OBSERVER
 	}
 
 	ZEND_OBSERVER_FCALL_END(generator->execute_data, &generator->retval);
-	ZEND_SIMPLE_INTERRUPT_CHECK(generator->execute_data);
 
 	EG(current_execute_data) = EX(prev_execute_data);
 
@@ -8986,7 +8980,6 @@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY, SPEC(OBSERVER))
 		}
 #endif
 		ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
-		ZEND_SIMPLE_INTERRUPT_CHECK(call);
 
 		EG(current_execute_data) = call->prev_execute_data;