Delay user error handlers, destructors

Zend/Optimizer/zend_inference.c

@@ -4951,7 +4951,7 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 		}
 	} else if (opline->op1_type & (IS_TMP_VAR|IS_VAR)) {
 		if ((t1 & MAY_BE_RC1)
-		 && (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY))) {
+		 && (t1 & (MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY))) {
 			switch (opline->opcode) {
 				case ZEND_CASE:
 				case ZEND_CASE_STRICT:
@@ -4972,7 +4972,7 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 				case ZEND_MAKE_REF:
 					break;
 				default:
-					/* destructor may be called */
+					/* resource destructor may be called */
 					return 1;
 			}
 		}
@@ -4992,14 +4992,14 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 		}
 	} else if (opline->op2_type & (IS_TMP_VAR|IS_VAR)) {
 		if ((t2 & MAY_BE_RC1)
-		 && (t2 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY))) {
+		 && (t2 & (MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY))) {
 			switch (opline->opcode) {
 				case ZEND_ASSIGN:
 				case ZEND_FE_FETCH_R:
 				case ZEND_FE_FETCH_RW:
 					break;
 				default:
-					/* destructor may be called */
+					/* resource destructor may be called */
 					return 1;
 			}
 		}
@@ -5178,11 +5178,11 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 			}
 			ZEND_FALLTHROUGH;
 		case ZEND_UNSET_VAR:
-			return (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY));
+			return (t1 & (MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY));
 		case ZEND_BIND_STATIC:
 		case ZEND_BIND_INIT_STATIC_OR_JMP:
-			if (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY)) {
-				/* Destructor may throw. */
+			if (t1 & (MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY)) {
+				/* resource destructor may throw. */
 				return 1;
 			}
 			return 0;
@@ -5192,7 +5192,7 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 					return 1;
 				}
 			}
-			if (t1 & (MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_REF)) {
+			if (t1 & (MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_REF)) {
 				return 1;
 			}
 			return (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_TRUE|MAY_BE_FALSE|MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE)) || opline->op2_type == IS_UNUSED ||
@@ -5317,7 +5317,7 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
 			}
 			if (opline->op2_type == IS_CV
 			 && (t2 & MAY_BE_RC1)
-			 && (t2 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY))) {
+			 && (t2 & (MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY))) {
 				return 1;
 			}
 			return 0;

Zend/Optimizer/zend_inference.h

@@ -34,6 +34,10 @@
 	(MAY_BE_OBJECT|MAY_BE_RESOURCE \
 	|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE)
 
+#define MAY_HAVE_UNDELAYED_DTOR \
+	(MAY_BE_RESOURCE \
+	|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_ARRAY_OF_RESOURCE)
+
 #define DEFINE_SSA_OP_HAS_RANGE(opN) \
 	static zend_always_inline bool _ssa_##opN##_has_range(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op *opline, const zend_ssa_op *ssa_op) \
 	{ \

Zend/tests/ArrayAccess/bug41209.phpt

@@ -7,7 +7,7 @@ class env
 {
     public function __construct()
     {
-        set_error_handler(array(__CLASS__, 'errorHandler'));
+        set_error_handler(array(__CLASS__, 'errorHandler'), delay: false);
     }
 
     public static function errorHandler($errno, $errstr, $errfile, $errline)

Zend/tests/attributes/deprecated/class_constants/deprecated_constant_as_message_002.phpt

@@ -5,7 +5,7 @@
 
 set_error_handler(function (int $errno, string $errstr, ?string $errfile = null, ?int $errline = null) {
 	throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-});
+}, delay: false);
 
 class Clazz {
 	#[\Deprecated(self::TEST)]

Zend/tests/attributes/deprecated/constants/deprecated_constant_as_message_002.phpt

@@ -5,7 +5,7 @@
 
 set_error_handler(function (int $errno, string $errstr, ?string $errfile = null, ?int $errline = null) {
 	throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-});
+}, delay: false);
 
 #[\Deprecated(TEST)]
 const TEST = "from itself";

Zend/tests/attributes/deprecated/functions/throwing_error_handler_001.phpt

@@ -5,7 +5,7 @@
 
 set_error_handler(function (int $errno, string $errstr, ?string $errfile = null, ?int $errline = null) {
 	throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-});
+}, delay: false);
 
 #[\Deprecated("convert to exception")]
 function test() {
@@ -76,7 +76,7 @@ class Destructor {
 }
 
 try {
-	new Destructor();
+	(function () { new Destructor(); })();
 } catch (ErrorException $e) {
 	echo "Caught: ", $e->getMessage(), PHP_EOL;
 }

Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt

@@ -30,8 +30,8 @@ try {
 }
 ?>
 --EXPECTF--
-ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ include
-ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
+ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ __construct
+ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='.:') @ __construct
 
 Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s
 Stack trace:

Zend/tests/bind_static_exception.phpt

@@ -8,8 +8,10 @@ class Test {
     }
 }
 try {
-    $new = new Test;
-    static $new;
+    (function () {
+        $new = new Test;
+        static $new;
+    })();
 } catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }

Zend/tests/bitwise_not_precision_exception.phpt

@@ -4,7 +4,7 @@ Promoting float precision warning to exception in bitwise_not
 <?php
 set_error_handler(function($_, $msg) {
     throw new Exception($msg);
-});
+}, delay: false);
 try {
     var_dump(~INF);
 } catch (Exception $e) {

Zend/tests/bug29896.phpt

@@ -23,5 +23,4 @@ GenerateError2("Test2");
 ?>
 --EXPECTF--
 #0 %s(%d): userErrorHandler(2, 'Undefined varia...', '%s', %d)
-#1 %s(%d): GenerateError1('Test1')
-#2 %s(%d): GenerateError2('Test2')
+#1 %s(%d): GenerateError2('Test2')

Zend/tests/bug35017.phpt

@@ -2,7 +2,7 @@
 Bug #35017 (Exception thrown in error handler may cause unexpected behavior)
 --FILE--
 <?php
-set_error_handler('errorHandler');
+set_error_handler('errorHandler', delay: false);
 try {
     if ($a) {
         echo "1\n";

Zend/tests/bug38220.phpt

@@ -26,6 +26,7 @@ class A {
         $drv = myserv::drv();
 
         $drv->obj = $this;
+        (function (){})();
 
         echo "before call $method\n";
         print_r($this);

Zend/tests/bug49893.phpt

@@ -18,8 +18,11 @@ class B {
         throw new Exception("1");
     }
 }
-try {
+function f() {
     $b = new B();
+}
+try {
+    f();
 } catch(Exception $e) {
     echo $e->getMessage() . "\n";
 }

Zend/tests/bug52041.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Bug #52041 (Memory leak when writing on uninitialized variable returned from function)
+--INI--
+opcache.jit=0
 --FILE--
 <?php
 function foo() {

Zend/tests/bug60909_1.phpt

@@ -6,7 +6,7 @@ register_shutdown_function(function(){echo("\n\n!!!shutdown!!!\n\n");});
 set_error_handler(function($errno, $errstr, $errfile, $errline){
  echo "error($errstr)";
  throw new Exception("Foo");
-});
+}, delay: false);
 
 require 'notfound.php';
 ?>

Zend/tests/bug61767.phpt

@@ -5,7 +5,7 @@ Bug #61767 (Shutdown functions not called in certain error situation)
 set_error_handler(function($code, $msg, $file = null, $line = null) {
     echo "Error handler called ($msg)\n";
     throw new \ErrorException($msg, $code, 0, $file, $line);
-});
+}, delay: false);
 
 register_shutdown_function(function(){
     echo "Shutting down\n";

Zend/tests/bug63206.phpt

@@ -14,13 +14,19 @@ set_error_handler(function() {
         echo 'Internal handler' . PHP_EOL;
     });
 
+    global $tmp;
     $triggerInternalNotice++; // warnings while handling the error should go into internal handler
+    fwrite($tmp, "."); // handle errors
 
     restore_error_handler();
 });
 
+$tmp = tmpfile();
+
 $triggerNotice1++;
+fwrite($tmp, "."); // handle errors
 $triggerNotice2++;
+fwrite($tmp, "."); // handle errors
 ?>
 --EXPECT--
 Second handler

Zend/tests/bug70662.phpt

@@ -14,5 +14,5 @@ var_dump($a);
 --EXPECT--
 array(1) {
   ["b"]=>
-  int(2)
+  int(1)
 }

Zend/tests/bug70785.phpt

@@ -5,7 +5,7 @@ Bug #70785 (Infinite loop due to exception during identical comparison)
 
 set_error_handler(function($no, $msg) {
     throw new Exception($msg);
-});
+}, delay: false);
 
 try {
     if ($a === null) { // ZEND_VM_SMART_BRANCH

Zend/tests/bug72101.phpt

@@ -63,7 +63,7 @@ class Mock_MethodCallbackByReference_7b180d26 extends MethodCallbackByReference
 set_error_handler(function() {
 //    var_dump(func_get_args());
     DoesNotExists::$nope = true;
-}, E_ALL);
+}, E_ALL, delay: false);
 
 $foo = new Mock_MethodCallbackByReference_7b180d26();
 $InvMocker = new PHPUnit_Framework_MockObject_InvocationMocker();

Zend/tests/bug74164.phpt

@@ -7,14 +7,13 @@ namespace Foo;
 
 set_error_handler(function ($type, $msg) {
     throw new \Exception($msg);
-});
+}, delay: false);
 
 call_user_func(function (array &$ref) {var_dump("xxx");}, 'not_an_array_variable');
 ?>
 --EXPECTF--
 Fatal error: Uncaught Exception: {closure:%s:%d}(): Argument #1 ($ref) must be passed by reference, value given in %s:%d
 Stack trace:
-#0 [internal function]: {closure:%s:%d}(2, '%s', '%s', 9)
-#1 %sbug74164.php(%d): call_user_func(%s)
-#2 {main}
+#0 %s(%d): {closure:%s:%d}(2, '{closure:%s', '%s', 9)
+#1 {main}
   thrown in %sbug74164.php on line %d

Zend/tests/bug76534.phpt

@@ -4,7 +4,7 @@ Bug #76534 (PHP hangs on 'illegal string offset on string references with an err
 <?php
 set_error_handler(function ($severity, $message, $file, $line) {
     throw new \Exception($message);
-});
+}, delay: false);
 
 $x = "foo";
 $y = &$x["2bar"];

Zend/tests/bug78598.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Bug #78598: Changing array during undef index RW error segfaults
+--INI--
+opcache.jit=0
 --FILE--
 <?php
 
@@ -25,7 +27,31 @@ var_dump($my_var);
 
 ?>
 --EXPECT--
-int(0)
-int(0)
-int(0)
-int(0)
+array(1) {
+  [0]=>
+  string(3) "xyz"
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      string(3) "xyz"
+    }
+  }
+}
+array(1) {
+  ["foo"]=>
+  string(3) "xyz"
+}
+array(1) {
+  ["foo"]=>
+  array(1) {
+    ["bar"]=>
+    array(1) {
+      ["baz"]=>
+      string(3) "xyz"
+    }
+  }
+}

Zend/tests/bug79599.phpt

@@ -4,7 +4,7 @@ Bug #79599 (coredump in set_error_handler)
 <?php
 set_error_handler(function($code, $message){
     throw new \Exception($message);
-});
+}, delay: false);
 function test1(){
     $a[] = $b;
 }

Zend/tests/bug79784.phpt

@@ -15,6 +15,18 @@ var_dump($a);
 
 ?>
 --EXPECT--
-NULL
-NULL
-NULL
+array(1) {
+  [""]=>
+  string(1) "x"
+}
+array(1) {
+  [""]=>
+  string(1) "x"
+}
+array(1) {
+  [""]=>
+  array(1) {
+    [""]=>
+    string(1) "x"
+  }
+}

Zend/tests/bug79793.phpt

@@ -18,15 +18,15 @@ var_dump($ary);
 
 ?>
 --EXPECT--
-Undefined array key "foobar"
 array(1) {
   ["foobar"]=>
   int(1)
 }
-Undefined array key "foobarbaz"
+Undefined array key "foobar"
 array(2) {
   ["foobar"]=>
   int(1)
   ["foobarbaz"]=>
   int(1)
 }
+Undefined array key "foobarbaz"

Zend/tests/closures/closure_031.phpt

@@ -15,5 +15,5 @@ try {
 }
 ?>
 --EXPECT--
-Warning: Undefined property: Closure::$a
 NULL
+Warning: Undefined property: Closure::$a

Zend/tests/coalesce/assign_coalesce_002.phpt

@@ -46,6 +46,7 @@ class Dtor {
 $ary = new AA;
 try {
     $ary[new Dtor][id($foo)] ??= $bar;
+    (function () {})();
 } catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }