com php-src: Merge branch 'PHP-7.4' into PHP-8.0: Zend/tests/de ad_array_type_inference.phpt ext/opcache/Optimizer/ze nd_inference.c
| From: | Nikita Popov | Date: | Fri, 30 Oct 2020 14:52:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4' into PHP-8.0: Zend/tests/de ad_array_type_inference.phpt ext/opcache/Optimizer/ze nd_inference.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-113998@lists.php.net to get a copy of this message | ||
Commit: 5958137dc512ca4c6c82576b6f045559e39791e1
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 30 Oct 2020 15:52:24 +0100
Parents: 72d9d9b88f2fbd98bc6dcf2c27e5cb0c868e91dd 83738281eb9f2577eda1c76a6acfe644d6fcc6c1
Branches: PHP-8.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5958137dc512ca4c6c82576b6f045559e39791e1
Log:
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix SSA integrity violation for type inference in dead code
Changed paths:
AM Zend/tests/dead_array_type_inference.phpt
MM ext/opcache/Optimizer/zend_inference.c
Diff:
diff --cc Zend/tests/dead_array_type_inference.phpt
index 00000000000,51f9b05816e..f0f9d51ee2d
mode 000000,100644..100644
--- a/Zend/tests/dead_array_type_inference.phpt
+++ b/Zend/tests/dead_array_type_inference.phpt
@@@ -1,0 -1,18 +1,18 @@@
+ --TEST--
+ Make sure type inference upholds invariants for dead arrays
+ --FILE--
+ <?php
+
+ function test() {
+ foreach ($a as $v) {
+ $b[] = $v;
+ }
+ }
+
+ test();
+
+ ?>
+ --EXPECTF--
-Notice: Undefined variable: a in %s on line %d
++Warning: Undefined variable $a in %s on line %d
+
-Warning: Invalid argument supplied for foreach() in %s on line %d
++Warning: foreach() argument must be of type array|object, null given in %s on line %d