Only suppres instances of Exception and not Throwable by default

Author: Girgias

Zend/tests/silence_operator/listed_exceptions_can_suppress_Error.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Listing Error in silence throwable class list should suppress
+--FILE--
+<?php
+
+function test1() {
+    throw new Error();
+    return true;
+}
+
+$var = @<Error>test1();
+
+var_dump($var);
+
+echo "Done\n";
+?>
+--EXPECT--
+NULL
+Done

Zend/tests/silence_operator/silence_function_nested.phpt

@@ -13,7 +13,7 @@ function test2($a) {
     return test1();
 }
 
-$var = @test2();
+$var = @test2(1);
 
 var_dump($var);
 

Zend/tests/silence_operator/simple_silence_not_silence_Error.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Suppression operator must not suppres Error type Throwable errors
+--FILE--
+<?php
+
+function test1() {
+    throw new Error();
+    return true;
+}
+
+$var = @test1();
+
+var_dump($var);
+
+echo "Done\n";
+?>
+--EXPECTF--
+Fatal error: Uncaught Error in %s:4
+Stack trace:
+#0 %s(8): test1()
+#1 {main}
+  thrown in %s on line 4

Zend/tests/silence_operator/yield_from_silenced_non_iterable.phpt

@@ -9,6 +9,7 @@ function foo() {
 
 function generator() {
     yield 1;
+    /* This emits a Error type of throwable which is not suppressed */
     @yield from foo();
     yield 2;
 }
@@ -19,7 +20,11 @@ foreach (generator() as $val) {
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
 int(1)
-int(2)
-Done
+
+Fatal error: Uncaught Error: Can use "yield from" only with arrays and Traversables in %s:%d
+Stack trace:
+#0 %s(%d): generator()
+#1 {main}
+  thrown in %s on line %d

Zend/zend_vm_def.h

@@ -7395,8 +7395,6 @@ ZEND_VM_HANDLER(203, ZEND_SILENCE_CATCH, ANY, ANY)
 
 	SAVE_OPLINE();
 
-	zend_exception_restore();
-
 	/* Came from class list virtual catch blocks */
 	if (opline->extended_value == 2) {
 		if (EG(exception) == NULL) {
@@ -7414,6 +7412,13 @@ ZEND_VM_HANDLER(203, ZEND_SILENCE_CATCH, ANY, ANY)
 			HANDLE_EXCEPTION();
 		}
 	} else if (EG(exception) && opline->extended_value != 2) {
+		ZEND_ASSERT(EG(exception)->ce);
+		/* Only suppress Exception or a subclass of, and NOT Error throwable errors */
+		if (!instanceof_function(zend_ce_exception, EG(exception)->ce)) {
+			zend_rethrow_exception(execute_data);
+			HANDLE_EXCEPTION();
+		}
+
 #ifdef HAVE_DTRACE
 		if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
 			DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);
@@ -7876,8 +7881,11 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 		}
 	}
 
-	/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed */
-	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)) {
+	/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed
+	 * However, this can only happen if the exception is an instance of Exception
+	 * (Error never gets suppressed) */
+	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)
+			|| !instanceof_function(zend_ce_exception, EG(exception)->ce)) {
 		cleanup_unfinished_calls(execute_data, throw_op_num);
 	}
 

Zend/zend_vm_execute.h

@@ -2898,8 +2898,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN
 
 	SAVE_OPLINE();
 
-	zend_exception_restore();
-
 	/* Came from class list virtual catch blocks */
 	if (opline->extended_value == 2) {
 		if (EG(exception) == NULL) {
@@ -2917,6 +2915,13 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN
 			HANDLE_EXCEPTION();
 		}
 	} else if (EG(exception) && opline->extended_value != 2) {
+		ZEND_ASSERT(EG(exception)->ce);
+		/* Only suppress Exception or a subclass of, and NOT Error throwable errors */
+		if (!instanceof_function(zend_ce_exception, EG(exception)->ce)) {
+			zend_rethrow_exception(execute_data);
+			HANDLE_EXCEPTION();
+		}
+
 #ifdef HAVE_DTRACE
 		if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
 			DTRACE_EXCEPTION_CAUGHT((char *)EG(exception)->ce->name);
@@ -3144,8 +3149,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(
 		}
 	}
 
-	/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed */
-	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)) {
+	/* Do not cleanup unfinished calls for SILENCE live range as it might still get executed
+	 * However, this can only happen if the exception is an instance of Exception
+	 * (Error never gets suppressed) */
+	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)
+			|| !instanceof_function(zend_ce_exception, EG(exception)->ce)) {
 		cleanup_unfinished_calls(execute_data, throw_op_num);
 	}