Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 9824735aa4af · 2022-01-10T21:54:14.000+03:00
* PHP-8.0:
  Fix type inference
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -2680,9 +2680,6 @@ static zend_always_inline int _zend_update_type_info(
 						tmp |= MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING;
 					}
 				}
-				if (t1 & MAY_BE_OBJECT) {
-					tmp |= MAY_BE_REF;
-				}
 				tmp |= MAY_BE_RC1 | MAY_BE_RCN;
 				UPDATE_SSA_TYPE(tmp, ssa_op->result_def);
 			}
diff --git a/ext/opcache/tests/jit/assign_dim_008.phpt b/ext/opcache/tests/jit/assign_dim_008.phpt
@@ -0,0 +1,18 @@
+--TEST--
+JIT ASSIGN_DIM: 008
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--FILE--
+<?php
+function(int $a) {
+  $arr = $a[] = (y);
+  $arr = y;
+  $c = $y = $arr[] = y($c);
+}
+?>
+DONE
+--EXPECT--
+DONE

Original file line number	Diff line number	Diff line change
`@@ -2680,9 +2680,6 @@ static zend_always_inline int _zend_update_type_info(`
`2680`	`2680`	`tmp \|= MAY_BE_NULL\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_LONG\|MAY_BE_DOUBLE\|MAY_BE_STRING;`
`2681`	`2681`	`}`
`2682`	`2682`	`}`
`2683`		`- if (t1 & MAY_BE_OBJECT) {`
`2684`		`- tmp \|= MAY_BE_REF;`
`2685`		`- }`
`2686`	`2683`	`tmp \|= MAY_BE_RC1 \| MAY_BE_RCN;`
`2687`	`2684`	`UPDATE_SSA_TYPE(tmp, ssa_op->result_def);`
`2688`	`2685`	`}`