Remove zend_exception_save() and zend_exception_restore()

iluuu1994 · iluuu1994 · commit e138961a9dda · 2025-10-28T22:27:37.000+01:00
These are leftovers from the pre-PHP-7.0 era.
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1975,7 +1975,6 @@ ZEND_API zend_result zend_execute_script(int type, zval *retval, zend_file_handl
 	zend_result ret = SUCCESS;
 	if (op_array) {
 		zend_execute(op_array, retval);
-		zend_exception_restore();
 		if (UNEXPECTED(EG(exception))) {
 			if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
 				zend_user_exception_handler();
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -145,31 +145,6 @@ void zend_exception_set_previous(zend_object *exception, zend_object *add_previo
 }
 /* }}} */
 
-void zend_exception_save(void) /* {{{ */
-{
-	if (EG(prev_exception)) {
-		zend_exception_set_previous(EG(exception), EG(prev_exception));
-	}
-	if (EG(exception)) {
-		EG(prev_exception) = EG(exception);
-	}
-	EG(exception) = NULL;
-}
-/* }}} */
-
-void zend_exception_restore(void) /* {{{ */
-{
-	if (EG(prev_exception)) {
-		if (EG(exception)) {
-			zend_exception_set_previous(EG(exception), EG(prev_exception));
-		} else {
-			EG(exception) = EG(prev_exception);
-		}
-		EG(prev_exception) = NULL;
-	}
-}
-/* }}} */
-
 static zend_always_inline bool is_handle_exception_set(void) {
 	zend_execute_data *execute_data = EG(current_execute_data);
 	return !execute_data
@@ -241,10 +216,6 @@ ZEND_API ZEND_COLD void zend_throw_exception_internal(zend_object *exception) /*
 ZEND_API void zend_clear_exception(void) /* {{{ */
 {
 	zend_object *exception;
-	if (EG(prev_exception)) {
-		OBJ_RELEASE(EG(prev_exception));
-		EG(prev_exception) = NULL;
-	}
 	if (!EG(exception)) {
 		return;
 	}
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
@@ -41,8 +41,6 @@ extern ZEND_API zend_class_entry *zend_ce_unhandled_match_error;
 extern ZEND_API zend_class_entry *zend_ce_request_parse_body_exception;
 
 ZEND_API void zend_exception_set_previous(zend_object *exception, zend_object *add_previous);
-ZEND_API void zend_exception_save(void);
-ZEND_API void zend_exception_restore(void);
 
 ZEND_API ZEND_COLD void zend_throw_exception_internal(zend_object *exception);
 
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1317,6 +1317,7 @@ ZEND_API bool zend_internal_call_should_throw(const zend_function *fbc, zend_exe
 
 	if ((fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) &&
 			!zend_verify_internal_arg_types(fbc, call)) {
+		zend_clear_exception();
 		return 1;
 	}
 
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -176,7 +176,6 @@ void init_executor(void) /* {{{ */
 	ZEND_ATOMIC_BOOL_INIT(&EG(timed_out), false);
 
 	EG(exception) = NULL;
-	EG(prev_exception) = NULL;
 
 	EG(fake_scope) = NULL;
 	EG(trampoline).common.function_name = NULL;
@@ -1272,9 +1271,7 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
 	zend_long previous_lineno = EG(lineno_override);
 	EG(filename_override) = NULL;
 	EG(lineno_override) = -1;
-	zend_exception_save();
 	ce = zend_autoload(autoload_name, lc_name);
-	zend_exception_restore();
 	EG(filename_override) = previous_filename;
 	EG(lineno_override) = previous_lineno;
 
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
@@ -255,7 +255,7 @@ struct _zend_executor_globals {
 
 	zend_objects_store objects_store;
 	zend_lazy_objects_store lazy_objects_store;
-	zend_object *exception, *prev_exception;
+	zend_object *exception;
 	const zend_op *opline_before_exception;
 	zend_op exception_op[3];
 
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -2764,7 +2764,6 @@ skip_escape_conversion:
 
 		zend_ptr_stack_reverse_apply(&current_state.heredoc_label_stack, copy_heredoc_label_stack);
 
-		zend_exception_save();
 		while (heredoc_nesting_level) {
 			zval zv;
 			int retval;
@@ -2793,7 +2792,6 @@ skip_escape_conversion:
 					heredoc_nesting_level = 0;
 			}
 		}
-		zend_exception_restore();
 
 		if (
 		    (first_token == T_VARIABLE
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4797,10 +4797,8 @@ ZEND_VM_COLD_CONST_HANDLER(108, ZEND_THROW, CONST|TMPVAR|CV, ANY)
 		}
 	} while (0);
 
-	zend_exception_save();
 	Z_TRY_ADDREF_P(value);
 	zend_throw_exception_object(value);
-	zend_exception_restore();
 	FREE_OP1();
 	HANDLE_EXCEPTION();
 }
@@ -4813,7 +4811,6 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, JMP_ADDR, LAST_CATCH|CACHE_SLOT)
 
 	SAVE_OPLINE();
 	/* Check whether an exception has been thrown, if not, jump over code */
-	zend_exception_restore();
 	if (EG(exception) == NULL) {
 		ZEND_VM_JMP_EX(OP_JMP_ADDR(opline, opline->op2), 0);
 	}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4641,7 +4641,6 @@ static zend_result accel_preload(const char *config, bool in_child)
 		zend_destroy_file_handle(&file_handle);
 		if (op_array) {
 			zend_execute(op_array, NULL);
-			zend_exception_restore();
 			if (UNEXPECTED(EG(exception))) {
 				if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) {
 					zend_user_exception_handler();
diff --git a/sapi/fuzzer/fuzzer-execute-common.h b/sapi/fuzzer/fuzzer-execute-common.h
@@ -134,7 +134,6 @@ ZEND_ATTRIBUTE_UNUSED static void create_file(void) {
 
 ZEND_ATTRIBUTE_UNUSED static void opcache_invalidate(void) {
 	steps_left = MAX_STEPS;
-	zend_exception_save();
 	zval retval, args[2];
 	zend_function *fn = zend_hash_str_find_ptr(CG(function_table), ZEND_STRL("opcache_invalidate"));
 	ZEND_ASSERT(fn != NULL);
@@ -145,5 +144,4 @@ ZEND_ATTRIBUTE_UNUSED static void opcache_invalidate(void) {
 	ZEND_ASSERT(Z_TYPE(retval) == IS_TRUE);
 	zval_ptr_dtor(&args[0]);
 	zval_ptr_dtor(&retval);
-	zend_exception_restore();
 }
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
@@ -716,10 +716,6 @@ static inline void phpdbg_handle_exception(void) /* {{{ */
 	phpdbg_writeln("%s", ZSTR_VAL(msg));
 	zend_string_release(msg);
 
-	if (EG(prev_exception)) {
-		OBJ_RELEASE(EG(prev_exception));
-		EG(prev_exception) = 0;
-	}
 	OBJ_RELEASE(ex);
 	EG(opline_before_exception) = NULL;
 
@@ -876,7 +872,6 @@ PHPDBG_COMMAND(run) /* {{{ */
 		} zend_end_try();
 
 		if (restore) {
-			zend_exception_restore();
 			zend_try {
 				zend_try_exception_handler();
 				PHPDBG_G(in_execution) = 1;

Original file line number	Diff line number	Diff line change
`@@ -1317,6 +1317,7 @@ ZEND_API bool zend_internal_call_should_throw(const zend_function *fbc, zend_exe`
`1317`	`1317`
`1318`	`1318`	`if ((fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) &&`
`1319`	`1319`	`!zend_verify_internal_arg_types(fbc, call)) {`
	`1320`	`+ zend_clear_exception();`
`1320`	`1321`	`return 1;`
`1321`	`1322`	`}`
`1322`	`1323`
Original file line number	Diff line number	Diff line change
`@@ -2764,7 +2764,6 @@ skip_escape_conversion:`
`2764`	`2764`
`2765`	`2765`	`zend_ptr_stack_reverse_apply(&current_state.heredoc_label_stack, copy_heredoc_label_stack);`
`2766`	`2766`
`2767`		`- zend_exception_save();`
`2768`	`2767`	`while (heredoc_nesting_level) {`
`2769`	`2768`	`zval zv;`
`2770`	`2769`	`int retval;`
`@@ -2793,7 +2792,6 @@ skip_escape_conversion:`
`2793`	`2792`	`heredoc_nesting_level = 0;`
`2794`	`2793`	`}`
`2795`	`2794`	`}`
`2796`		`- zend_exception_restore();`
`2797`	`2795`
`2798`	`2796`	`if (`
`2799`	`2797`	`(first_token == T_VARIABLE`
Original file line number	Diff line number	Diff line change
`@@ -4797,10 +4797,8 @@ ZEND_VM_COLD_CONST_HANDLER(108, ZEND_THROW, CONST\|TMPVAR\|CV, ANY)`
`4797`	`4797`	`}`
`4798`	`4798`	`} while (0);`
`4799`	`4799`
`4800`		`- zend_exception_save();`
`4801`	`4800`	`Z_TRY_ADDREF_P(value);`
`4802`	`4801`	`zend_throw_exception_object(value);`
`4803`		`- zend_exception_restore();`
`4804`	`4802`	`FREE_OP1();`
`4805`	`4803`	`HANDLE_EXCEPTION();`
`4806`	`4804`	`}`
`@@ -4813,7 +4811,6 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, JMP_ADDR, LAST_CATCH\|CACHE_SLOT)`
`4813`	`4811`
`4814`	`4812`	`SAVE_OPLINE();`
`4815`	`4813`	`/* Check whether an exception has been thrown, if not, jump over code */`
`4816`		`- zend_exception_restore();`
`4817`	`4814`	`if (EG(exception) == NULL) {`
`4818`	`4815`	`ZEND_VM_JMP_EX(OP_JMP_ADDR(opline, opline->op2), 0);`
`4819`	`4816`	`}`