Drop check for exception type and add tests

Author: Girgias

Zend/tests/silence_operator/internal_function_supp_arg_exception.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Silencing an internal function supplementary argument throwing an Exception
+--FILE--
+<?php
+
+function foo() {
+    throw new Exception();
+    return 1;
+}
+
+$var = error_get_last(@foo());
+
+var_dump($var);
+
+echo "Done\n";
+?>
+--EXPECTF--
+Fatal error: Uncaught ArgumentCountError: error_get_last() expects exactly 0 arguments, 1 given in %s:%d
+Stack trace:
+#0 %s(%d): error_get_last(NULL)
+#1 {main}
+  thrown in %s on line %d

Zend/tests/silence_operator/internal_function_supp_arg_exception_listed.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Listed silencing a internal function supplementary argument throwing an Exception
+--FILE--
+<?php
+
+function foo() {
+    throw new Exception();
+    return 1;
+}
+
+$var = error_get_last(@<Exception>foo());
+
+var_dump($var);
+
+echo "Done\n";
+?>
+--EXPECTF--
+Fatal error: Uncaught ArgumentCountError: error_get_last() expects exactly 0 arguments, 1 given in %s:%d
+Stack trace:
+#0 %s(%d): error_get_last(NULL)
+#1 {main}
+  thrown in %s on line %d

Zend/tests/silence_operator/user_function_supp_arg_exception.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Silencing a userland function supplementary argument throwing an Exception
+--FILE--
+<?php
+
+function test1() {
+    return func_get_args();
+}
+
+function foo() {
+    throw new Exception();
+    return 1;
+}
+
+$var = test1(@foo());
+
+var_dump($var);
+
+echo "Done\n";
+?>
+--EXPECT--
+array(1) {
+  [0]=>
+  NULL
+}
+Done

Zend/tests/silence_operator/user_function_supp_arg_exception_listed.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Listed silencing a userland function supplementary argument throwing an Exception
+--FILE--
+<?php
+
+function test1() {
+    return func_get_args();
+}
+
+function foo() {
+    throw new Exception();
+    return 1;
+}
+
+$var = test1(@<Exception>foo());
+
+var_dump($var);
+
+echo "Done\n";
+?>
+--EXPECT--
+array(1) {
+  [0]=>
+  NULL
+}
+Done

Zend/zend_vm_def.h

@@ -7869,8 +7869,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 	/* 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)) {
+	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)) {
 		cleanup_unfinished_calls(execute_data, throw_op_num);
 	}
 

Zend/zend_vm_execute.h

@@ -3144,8 +3144,7 @@ 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
 	 * 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)) {
+	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)) {
 		cleanup_unfinished_calls(execute_data, throw_op_num);
 	}