Fix EG(record_errors) leak when compilation bails out

Since 7b3e68f, a bailout in compile_file() or in the opcache optimizer
leaves EG(record_errors) true. The next compilation fails the assertion
"Error recording already enabled", and PHP does not show later warnings.

Add a zend_catch block to these three regions, as opcache_compile_file()
does. Add zend_test.fatal_error_in_pass to do a test of the optimizer.

Author: ptondereau

NEWS

@@ -24,6 +24,8 @@ PHP                                                                        NEWS
     the end of their mapping. (Ilia Alshanetsky)
   . Fixed exception thrown by destructor during GC in a Fiber not being rethrown
     into the frame that triggered the GC. (Nicolas Grekas)
+  . Fixed warnings being silently dropped after a fatal error during
+    compilation or optimization. (Pierre Tondereau)
 
 - CLI
   . Fix GH-22567 (Windows ZTS CLI SAPI should refresh its TSRMLS cache during

Zend/tests/errmsg/record_errors_compile_bailout.inc

@@ -0,0 +1,5 @@
+<?php
+class A {
+    function f() {}
+    function f() {}
+}

Zend/tests/errmsg/record_errors_compile_bailout.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Error recording is disabled after a fatal error during compilation
+--FILE--
+<?php
+register_shutdown_function(function () {
+    trigger_error('From shutdown', E_USER_WARNING);
+});
+require __DIR__ . '/record_errors_compile_bailout.inc';
+?>
+--EXPECTF--
+Fatal error: Cannot redeclare A::f() in %srecord_errors_compile_bailout.inc on line %d
+
+Warning: From shutdown in %s on line %d

Zend/zend_language_scanner.l

@@ -657,7 +657,15 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type)
 			zend_begin_record_errors();
 		}
 
-		op_array = zend_compile(ZEND_USER_FUNCTION);
+		zend_try {
+			op_array = zend_compile(ZEND_USER_FUNCTION);
+		} zend_catch {
+			if (!orig_record_errors) {
+				EG(record_errors) = false;
+				zend_free_recorded_errors();
+			}
+			zend_bailout();
+		} zend_end_try();
 
 		if (!orig_record_errors) {
 			zend_emit_recorded_errors();

ext/opcache/ZendAccelerator.c

@@ -1956,7 +1956,13 @@ static zend_op_array *file_cache_compile_file(zend_file_handle *file_handle, int
 		}
 
 		from_memory = false;
-		persistent_script = cache_script_in_file_cache(persistent_script, &from_memory);
+		zend_try {
+			persistent_script = cache_script_in_file_cache(persistent_script, &from_memory);
+		} zend_catch {
+			EG(record_errors) = false;
+			zend_free_recorded_errors();
+			zend_bailout();
+		} zend_end_try();
 
 		zend_emit_recorded_errors();
 		zend_free_recorded_errors();
@@ -2182,7 +2188,16 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
 
 			/* See GH-17246: we disable GC so that user code cannot be executed during the optimizer run. */
 			bool orig_gc_state = gc_enable(false);
-			persistent_script = cache_script_in_shared_memory(persistent_script, key, &from_shared_memory);
+			zend_try {
+				persistent_script = cache_script_in_shared_memory(persistent_script, key, &from_shared_memory);
+			} zend_catch {
+				gc_enable(orig_gc_state);
+				SHM_PROTECT();
+				HANDLE_UNBLOCK_INTERRUPTIONS();
+				EG(record_errors) = false;
+				zend_free_recorded_errors();
+				zend_bailout();
+			} zend_end_try();
 			gc_enable(orig_gc_state);
 		}
 

ext/opcache/tests/record_errors/bailout.inc

@@ -0,0 +1,2 @@
+<?php
+function f() {}

ext/opcache/tests/record_errors/file_cache_bailout.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Error recording is disabled after a fatal error during the optimizer with opcache.file_cache_only
+--EXTENSIONS--
+opcache
+zend_test
+--SKIPIF--
+<?php
+if (getenv("SKIP_REPEAT")) die("skip Not compatible with repeat");
+if (getenv("SKIP_PRELOAD")) die("skip Not compatible with preload");
+?>
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+zend_test.register_passes=1
+opcache.file_cache="{TMP}"
+opcache.file_cache_only=1
+--FILE--
+<?php
+register_shutdown_function(function () {
+    trigger_error('From shutdown', E_USER_WARNING);
+});
+ini_set('zend_test.fatal_error_in_pass', '1');
+require __DIR__ . '/bailout.inc';
+?>
+--EXPECTF--
+%Apass1
+
+Fatal error: Fatal error in pass1 in %s on line %d
+
+Warning: From shutdown in %s on line %d

ext/opcache/tests/record_errors/optimizer_bailout.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Error recording is disabled after a fatal error during the optimizer
+--EXTENSIONS--
+opcache
+zend_test
+--SKIPIF--
+<?php
+if (getenv("SKIP_REPEAT")) die("skip Not compatible with repeat");
+if (getenv("SKIP_PRELOAD")) die("skip Not compatible with preload");
+?>
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+zend_test.register_passes=1
+opcache.file_cache=
+opcache.file_cache_only=0
+--FILE--
+<?php
+register_shutdown_function(function () {
+    var_dump(gc_enabled());
+    trigger_error('From shutdown', E_USER_WARNING);
+});
+ini_set('zend_test.fatal_error_in_pass', '1');
+require __DIR__ . '/bailout.inc';
+?>
+--EXPECTF--
+pass1
+pass2
+pass1
+
+Fatal error: Fatal error in pass1 in %s on line %d
+bool(true)
+
+Warning: From shutdown in %s on line %d

ext/zend_test/php_test.h

@@ -55,6 +55,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test)
 	HashTable *global_weakmap;
 	int replace_zend_execute_ex;
 	int register_passes;
+	bool fatal_error_in_pass;
 	bool print_stderr_mshutdown;
 	zend_long limit_copy_file_range;
 	int observe_opline_in_zendmm;

ext/zend_test/test.c

@@ -120,6 +120,9 @@ static ZEND_FUNCTION(zend_test_void_return)
 static void pass1(zend_script *script, void *context)
 {
 	php_printf("pass1\n");
+	if (ZT_G(fatal_error_in_pass)) {
+		zend_error_noreturn(E_ERROR, "Fatal error in pass1");
+	}
 }
 
 static void pass2(zend_script *script, void *context)
@@ -1328,6 +1331,7 @@ static ZEND_METHOD(_ZendTestMagicCallForward, __call)
 PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("zend_test.replace_zend_execute_ex", "0", PHP_INI_SYSTEM, OnUpdateBool, replace_zend_execute_ex, zend_zend_test_globals, zend_test_globals)
 	STD_PHP_INI_BOOLEAN("zend_test.register_passes", "0", PHP_INI_SYSTEM, OnUpdateBool, register_passes, zend_zend_test_globals, zend_test_globals)
+	STD_PHP_INI_BOOLEAN("zend_test.fatal_error_in_pass", "0", PHP_INI_ALL, OnUpdateBool, fatal_error_in_pass, zend_zend_test_globals, zend_test_globals)
 	STD_PHP_INI_BOOLEAN("zend_test.print_stderr_mshutdown", "0", PHP_INI_SYSTEM, OnUpdateBool, print_stderr_mshutdown, zend_zend_test_globals, zend_test_globals)
 #ifdef HAVE_COPY_FILE_RANGE
 	STD_PHP_INI_ENTRY("zend_test.limit_copy_file_range", "-1", PHP_INI_ALL, OnUpdateLong, limit_copy_file_range, zend_zend_test_globals, zend_test_globals)