Some progress

Author: Girgias

Zend/tests/silence_operator/user_function_supp_arg_exception_type_error.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Listed silencing a userland function supplementary argument throwing an Exception
+--FILE--
+<?php
+
+function test1(int $v) {
+    return $v;
+}
+
+function foo() {
+    throw new Exception();
+    return 1;
+}
+
+try {
+    $var = test1(@<Exception>foo());
+    var_dump($var);
+} catch (\TypeError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+
+echo "Done\n";
+?>
+--EXPECTF--
+test1(): Argument #1 ($v) must be of type int, null given, called in %s on line %d
+Done

Zend/zend_execute.c

@@ -3901,10 +3901,13 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
 		/* 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 (UNEXPECTED(is_in_silence_live_range(EX(func)->op_array, op_num)
 				&& instanceof_function(zend_ce_exception, EG(exception)->ce))) {
 			return;
 		}
+		*/
+		bool is_silence = is_in_silence_live_range(EX(func)->op_array, op_num) && instanceof_function(zend_ce_exception, EG(exception)->ce);
 		zend_execute_data *call = EX(call);
 		zend_op *opline = EX(func)->op_array.opcodes + op_num;
 		int level;
@@ -3976,9 +3979,14 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o
 						}
 						break;
 				}
+
 				if (!do_exit) {
 					opline--;
 				}
+				/* If this a silence range we should only release the last arg */
+				if (is_silence) {
+					return;
+				}
 			} while (!do_exit);
 			if (call->prev_execute_data) {
 				/* skip current call region */

Zend/zend_vm_def.h

@@ -7434,12 +7434,19 @@ ZEND_VM_HANDLER(203, ZEND_SILENCE_CATCH, ANY, ANY)
 		/* Set value to NULL */
 		if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
 			/* Make internal functions which set a return value early return false */
+			/*
 			if (UNEXPECTED(Z_TYPE_P(EX_VAR(opline->result.var)) != IS_UNDEF
 					&& Z_TYPE_P(EX_VAR(opline->result.var)) <= IS_TRUE)) {
 				ZVAL_FALSE(EX_VAR(opline->result.var));
 			} else {
 				ZVAL_NULL(EX_VAR(opline->result.var));
 			}
+			*/
+
+			/* Set return value to null, except when an internal function has set a return value */
+			if (EXPECTED(Z_TYPE_P(EX_VAR(opline->result.var)) == IS_UNDEF)) {
+				ZVAL_NULL(EX_VAR(opline->result.var));
+			}
 		}
 	}
 

Zend/zend_vm_execute.h

@@ -2937,12 +2937,19 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SILENCE_CATCH_SPEC_HANDLER(ZEN
 		/* Set value to NULL */
 		if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
 			/* Make internal functions which set a return value early return false */
+			/*
 			if (UNEXPECTED(Z_TYPE_P(EX_VAR(opline->result.var)) != IS_UNDEF
 					&& Z_TYPE_P(EX_VAR(opline->result.var)) <= IS_TRUE)) {
 				ZVAL_FALSE(EX_VAR(opline->result.var));
 			} else {
 				ZVAL_NULL(EX_VAR(opline->result.var));
 			}
+			*/
+
+			/* Set return value to null, except when an internal function has set a return value */
+			if (EXPECTED(Z_TYPE_P(EX_VAR(opline->result.var)) == IS_UNDEF)) {
+				ZVAL_NULL(EX_VAR(opline->result.var));
+			}
 		}
 	}
 

ext/zend_test/test.c

@@ -27,6 +27,7 @@
 #include "zend_attributes.h"
 #include "zend_enum.h"
 #include "Zend/Optimizer/zend_optimizer.h"
+#include "zend_exceptions.h"
 #include "test_arginfo.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(zend_test)
@@ -250,21 +251,21 @@ static ZEND_FUNCTION(zend_suppress_exception_internal_return_false)
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	RETVAL_FALSE;
-	zend_throw_error(NULL, "Shouldn't be seen");
+	zend_throw_exception(NULL, "Shouldn't be seen", 0);
 }
 static ZEND_FUNCTION(zend_suppress_exception_internal_return_true)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	RETVAL_TRUE;
-	zend_throw_error(NULL, "Shouldn't be seen");
+	zend_throw_exception(NULL, "Shouldn't be seen", 0);
 }
 static ZEND_FUNCTION(zend_suppress_exception_internal_return_int)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	RETVAL_LONG(20);
-	zend_throw_error(NULL, "Shouldn't be seen");
+	zend_throw_exception(NULL, "Shouldn't be seen", 0);
 }
 
 static zend_object *zend_test_class_new(zend_class_entry *class_type)

ext/zend_test/tests/suppress_exception_internal_return_false.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Suppresion operator internal functions can return things other than null: false
---SKIPIF--
-<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 
@@ -19,5 +19,5 @@ echo 'Done', PHP_EOL;
 ?>
 --EXPECT--
 bool(false)
-Error: Shouldn't be seen
+Exception: Shouldn't be seen
 Done

ext/zend_test/tests/suppress_exception_internal_return_int.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Suppresion operator internal functions can return things other than null: int
---SKIPIF--
-<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
---XFAIL--
-TBD if should return false, null, or int
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 
@@ -21,5 +19,5 @@ echo 'Done', PHP_EOL;
 ?>
 --EXPECT--
 int(20)
-Error: Shouldn't be seen
+Exception: Shouldn't be seen
 Done

ext/zend_test/tests/suppress_exception_internal_return_true.phpt

@@ -1,9 +1,7 @@
 --TEST--
 Suppresion operator internal functions can return things other than null: true
---SKIPIF--
-<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
---XFAIL--
-TBD if should return false, null, or true
+--EXTENSIONS--
+zend_test
 --FILE--
 <?php
 
@@ -21,5 +19,5 @@ echo 'Done', PHP_EOL;
 ?>
 --EXPECT--
 bool(true)
-Error: Shouldn't be seen
+Exception: Shouldn't be seen
 Done