Fix binding allocation

Author: iluuu1994

Zend/tests/pattern_matching/is/binding.phpt

@@ -15,6 +15,21 @@ class NotBox {
     ) {}
 }
 
+class Many {
+    public function __construct(
+        public $a = 1,
+        public $b = 2,
+        public $c = 3,
+        public $d = 4,
+        public $e = 5,
+        public $f = 6,
+        public $g = 7,
+        public $h = 8,
+        public $i = 9,
+        public $j = 10,
+    ) {}
+}
+
 var_dump(10 is $a);
 var_dump($a);
 
@@ -33,6 +48,12 @@ var_dump($a);
 var_dump([] is $a @ string);
 var_dump($a);
 
+var_dump(new Many() is Many { $a, $b, $c, $d });
+var_dump($a, $b, $c, $d, isset($e));
+
+var_dump(new Many() is Many { $a, $b, $c, $d, $e, $f, $g, $h, $i, $j });
+var_dump($a, $b, $c, $d, $e, $f, $g, $h, $i, $j);
+
 ?>
 --EXPECT--
 bool(true)
@@ -47,3 +68,20 @@ bool(true)
 int(43)
 bool(false)
 int(43)
+bool(true)
+int(1)
+int(2)
+int(3)
+int(4)
+bool(false)
+bool(true)
+int(1)
+int(2)
+int(3)
+int(4)
+int(5)
+int(6)
+int(7)
+int(8)
+int(9)
+int(10)

Zend/tests/pattern_matching/is/binding_destruct.phpt

@@ -13,12 +13,11 @@ $foo = new Foo();
 $bar = 'bar';
 
 try {
-    42 is $foo or $bar;
+    42 is $foo & $bar;
 } catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }
 
-// FIXME: This will change once bindings are delayed
 var_dump($foo);
 var_dump($bar);
 

Zend/zend_pattern_matching.c

@@ -175,11 +175,14 @@ static pm_result match_binding(zval *zv, zend_ast *pattern)
 	if (!bindings) {
 		bindings = &context->bindings_spare;
 		context->bindings = bindings;
+		context->last_bindings = bindings;
 	} else if (bindings->num_used == ZEND_PM_BINDINGS_SLOTS) {
 		zend_pm_bindings *new_bindings = emalloc(sizeof(zend_pm_bindings));
-		new_bindings->next = bindings;
+		new_bindings->num_used = 0;
+		new_bindings->next = NULL;
+		context->last_bindings->next = new_bindings;
+		context->last_bindings = new_bindings;
 		bindings = new_bindings;
-		context->bindings = bindings;
 	}
 
 	zend_pm_binding *binding = &bindings->list[bindings->num_used++];
@@ -317,7 +320,6 @@ static void pm_context_free(bool free_values)
 		if (bindings != &context->bindings_spare) {
 			efree(bindings);
 		}
-		bindings = bindings->next;
 		bindings = next;
 	}
 

Zend/zend_pattern_matching.h

@@ -36,6 +36,7 @@ struct _zend_pm_bindings {
 typedef struct _zend_pm_context zend_pm_context;
 typedef struct _zend_pm_context {
 	zend_pm_bindings *bindings;
+	zend_pm_bindings *last_bindings;
 	zend_pm_bindings bindings_spare;
 	zend_pm_context *prev;
 } zend_pm_context;