Avoid interrupt cleanup for frameless reentry copies

Author: prateekbhujel

Zend/zend_execute.c

@@ -1673,19 +1673,6 @@ ZEND_API bool zend_frameless_protect_args_for_reentry(void)
 	return true;
 }
 
-static bool zend_frameless_reentry_copies_in_use(zend_frameless_reentry_copies *copies)
-{
-	for (zend_execute_data *execute_data = EG(current_execute_data);
-			execute_data;
-			execute_data = execute_data->prev_execute_data) {
-		if (execute_data == copies->execute_data && execute_data->opline == copies->opline) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 static void zend_frameless_free_reentry_copies(zend_frameless_reentry_copies *copies)
 {
 	for (uint32_t i = 0; i < 3; i++) {
@@ -1714,33 +1701,18 @@ ZEND_API void zend_frameless_cleanup_reentry_copies_for_handler(zend_execute_dat
 	}
 }
 
-static void zend_frameless_cleanup_reentry_copies_ex(bool force)
+ZEND_API void zend_frameless_cleanup_reentry_copies_force(void)
 {
 	zend_frameless_reentry_copies **next = &EG(frameless_reentry_copies);
 
 	while (*next) {
 		zend_frameless_reentry_copies *copies = *next;
 
-		if (!force && zend_frameless_reentry_copies_in_use(copies)) {
-			next = &copies->prev;
-			continue;
-		}
-
 		*next = copies->prev;
 		zend_frameless_free_reentry_copies(copies);
 	}
 }
 
-ZEND_API void zend_frameless_cleanup_reentry_copies(void)
-{
-	zend_frameless_cleanup_reentry_copies_ex(false);
-}
-
-ZEND_API void zend_frameless_cleanup_reentry_copies_force(void)
-{
-	zend_frameless_cleanup_reentry_copies_ex(true);
-}
-
 static void frameless_observed_call_copy(zend_execute_data *call, uint32_t arg, zval *zv)
 {
 	if (Z_ISUNDEF_P(zv)) {
@@ -4240,7 +4212,6 @@ ZEND_API void ZEND_FASTCALL zend_free_compiled_variables(zend_execute_data *exec
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_fcall_interrupt(zend_execute_data *call)
 {
 	zend_atomic_bool_store_ex(&EG(vm_interrupt), false);
-	zend_frameless_cleanup_reentry_copies();
 	if (zend_atomic_bool_load_ex(&EG(timed_out))) {
 		zend_timeout();
 	} else if (zend_interrupt_function) {

Zend/zend_execute.h

@@ -430,7 +430,6 @@ ZEND_API user_opcode_handler_t zend_get_user_opcode_handler(uint8_t opcode);
 ZEND_API zval *zend_get_zval_ptr(const zend_op *opline, int op_type, const znode_op *node, const zend_execute_data *execute_data);
 ZEND_API bool zend_frameless_protect_args_for_reentry(void);
 ZEND_API void zend_frameless_cleanup_reentry_copies_for_handler(zend_execute_data *execute_data, const zend_op *opline);
-ZEND_API void zend_frameless_cleanup_reentry_copies(void);
 ZEND_API void zend_frameless_cleanup_reentry_copies_force(void);
 
 ZEND_API void zend_clean_and_cache_symbol_table(zend_array *symbol_table);

Zend/zend_execute_API.c

@@ -1042,7 +1042,6 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
 		/* This flag is regularly checked while running user functions, but not internal
 		 * So see whether interrupt flag was set while the function was running... */
 		if (zend_atomic_bool_exchange_ex(&EG(vm_interrupt), false)) {
-			zend_frameless_cleanup_reentry_copies();
 			if (zend_atomic_bool_load_ex(&EG(timed_out))) {
 				zend_timeout();
 			} else if (zend_interrupt_function) {

Zend/zend_vm_def.h

@@ -10423,7 +10423,6 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)
 {
 	zend_atomic_bool_store_ex(&EG(vm_interrupt), false);
 	SAVE_OPLINE();
-	zend_frameless_cleanup_reentry_copies();
 	if (zend_atomic_bool_load_ex(&EG(timed_out))) {
 		zend_timeout();
 	} else if (zend_interrupt_function) {