Infer static for closures and add stateless closure cache

See #19754 (comment)

Author: iluuu1994

Zend/Optimizer/compact_literals.c

@@ -742,6 +742,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
 					}
 					break;
 				case ZEND_CALLABLE_CONVERT:
+				case ZEND_DECLARE_LAMBDA_FUNCTION:
 					if (opline->extended_value != (uint32_t)-1) {
 						opline->extended_value = cache_size;
 						cache_size += sizeof(void *);

Zend/tests/arrow_functions/005.phpt

@@ -40,8 +40,7 @@ class Test {
 
 ?>
 --EXPECT--
-object(Test)#1 (0) {
-}
+NULL
 object(Test)#1 (0) {
 }
 object(Test)#1 (0) {

Zend/tests/bug75079_2.phpt

@@ -31,6 +31,6 @@ int(123)
 
 Fatal error: Uncaught Error: Cannot access private property Foo::$bar in %s:%d
 Stack trace:
-#0 %s(%d): A->{closure:%s:%d}()
+#0 %s(%d): A::{closure:%s:%d}()
 #1 {main}
   thrown in %s on line %d

Zend/tests/closures/closure_020.phpt

@@ -28,7 +28,7 @@ object(foo)#%d (2) {
   ["test":"foo":private]=>
   int(3)
   ["a"]=>
-  object(Closure)#%d (5) {
+  object(Closure)#%d (%d) {
     ["name"]=>
     string(%d) "{closure:%s:%d}"
     ["file"]=>
@@ -40,8 +40,6 @@ object(foo)#%d (2) {
       ["a"]=>
       *RECURSION*
     }
-    ["this"]=>
-    *RECURSION*
   }
 }
 bool(true)

Zend/tests/closures/closure_026.phpt

@@ -33,15 +33,13 @@ object(foo)#%d (1) {
   ["a"]=>
   array(1) {
     [0]=>
-    object(Closure)#%d (4) {
+    object(Closure)#%d (%d) {
       ["name"]=>
       string(%d) "{closure:%s:%d}"
       ["file"]=>
       string(%d) "%s"
       ["line"]=>
       int(%d)
-      ["this"]=>
-      *RECURSION*
     }
   }
 }
@@ -50,18 +48,13 @@ int(1)
 string(1) "a"
 array(1) {
   [0]=>
-  object(Closure)#%d (4) {
+  object(Closure)#%d (%d) {
     ["name"]=>
     string(%d) "{closure:%s:%d}"
     ["file"]=>
     string(%d) "%s"
     ["line"]=>
     int(%d)
-    ["this"]=>
-    object(foo)#%d (1) {
-      ["a"]=>
-      *RECURSION*
-    }
   }
 }
 int(1)

Zend/tests/gc/bug60139.phpt

@@ -8,7 +8,7 @@ class Foo {
     public $x;
 
     public function __construct() {
-        $this->x = function() {};
+        $this->x = function () { $this; };
     }
 }
 
@@ -17,7 +17,7 @@ class Bar {
 
     public function __construct() {
         $self = $this;
-        $this->x = function() use ($self) {};
+        $this->x = function() use ($self) { $this; };
     }
 }
 

Zend/tests/generators/generator_closure_collection.phpt

@@ -4,6 +4,8 @@ The Closure object of a generator is freed when the generator is freed.
 <?php
 
 $genFactory = function() {
+  /* Avoid static inference and caching. */
+  static $dummy;
   yield 1;
   yield 2;
   yield 3;
@@ -25,23 +27,33 @@ var_dump($r->get());
 
 ?>
 --EXPECTF--
-object(Closure)#%d (3) {
+object(Closure)#%d (4) {
   ["name"]=>
   string(%d) "{closure:%s:%d}"
   ["file"]=>
   string(%d) "%s"
   ["line"]=>
   int(%d)
+  ["static"]=>
+  array(1) {
+    ["dummy"]=>
+    NULL
+  }
 }
 int(1)
 int(2)
 int(3)
-object(Closure)#%d (3) {
+object(Closure)#%d (4) {
   ["name"]=>
   string(%d) "{closure:%s:%d}"
   ["file"]=>
   string(%d) "%s"
   ["line"]=>
   int(%d)
+  ["static"]=>
+  array(1) {
+    ["dummy"]=>
+    NULL
+  }
 }
 NULL

Zend/tests/return_types/012.phpt

@@ -15,7 +15,7 @@ $baz = new foo();
 var_dump($baz->bar());
 ?>
 --EXPECTF--
-object(Closure)#%d (5) {
+object(Closure)#%d (4) {
   ["name"]=>
   string(%d) "{closure:%s:%d}"
   ["file"]=>
@@ -27,7 +27,4 @@ object(Closure)#%d (5) {
     ["test"]=>
     string(3) "one"
   }
-  ["this"]=>
-  object(foo)#%d (0) {
-  }
 }

Zend/tests/return_types/013.phpt

@@ -17,6 +17,6 @@ var_dump($func=$baz->bar(), $func());
 --EXPECTF--
 Fatal error: Uncaught TypeError: foo::{closure:%s:%d}(): Return value must be of type array, null returned in %s:%d
 Stack trace:
-#0 %s(%d): foo->{closure:%s:%d}()
+#0 %s(%d): foo::{closure:%s:%d}()
 #1 {main}
   thrown in %s on line %d

Zend/zend_closures.c

@@ -75,14 +75,19 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */
 /* }}} */
 
 static bool zend_valid_closure_binding(
-		zend_closure *closure, zval *newthis, zend_class_entry *scope) /* {{{ */
+		zend_closure *closure, zval **newthis_ptr, zend_class_entry *scope) /* {{{ */
 {
+	zval *newthis = *newthis_ptr;
 	zend_function *func = &closure->func;
 	bool is_fake_closure = (func->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) != 0;
 	if (newthis) {
 		if (func->common.fn_flags & ZEND_ACC_STATIC) {
-			zend_error(E_WARNING, "Cannot bind an instance to a static closure, this will be an error in PHP 9");
-			return false;
+			if (!(func->common.fn_flags2 & ZEND_ACC2_INFERRED_STATIC)) {
+				zend_error(E_WARNING, "Cannot bind an instance to a static closure, this will be an error in PHP 9");
+				return false;
+			} else {
+				*newthis_ptr = NULL;
+			}
 		}
 
 		if (is_fake_closure && func->common.scope &&
@@ -144,13 +149,14 @@ ZEND_METHOD(Closure, call)
 
 	closure = (zend_closure *) Z_OBJ_P(ZEND_THIS);
 
-	newobj = Z_OBJ_P(newthis);
-	newclass = newobj->ce;
+	newclass = Z_OBJ_P(newthis)->ce;
 
-	if (!zend_valid_closure_binding(closure, newthis, newclass)) {
+	if (!zend_valid_closure_binding(closure, &newthis, newclass)) {
 		return;
 	}
 
+	newobj = newthis ? Z_OBJ_P(newthis) : NULL;
+
 	fci_cache.called_scope = newclass;
 	fci_cache.object = fci.object = newobj;
 
@@ -241,16 +247,16 @@ static void do_closure_bind(zval *return_value, zval *zclosure, zval *newthis, z
 		ce = NULL;
 	}
 
-	if (!zend_valid_closure_binding(closure, newthis, ce)) {
-		return;
-	}
-
 	if (newthis) {
 		called_scope = Z_OBJCE_P(newthis);
 	} else {
 		called_scope = ce;
 	}
 
+	if (!zend_valid_closure_binding(closure, &newthis, ce)) {
+		return;
+	}
+
 	zend_create_closure(return_value, &closure->func, ce, called_scope, newthis);
 }