From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 30 Oct 2020 14:52:24 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5958137dc512ca4c6c82576b6f045559e39791e1;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix SSA integrity violation for type inference in dead code
---

5958137dc512ca4c6c82576b6f045559e39791e1
diff --cc Zend/tests/dead_array_type_inference.phpt
index 0000000000,51f9b05816..f0f9d51ee2
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