]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 1 Sep 2020 10:25:56 +0000 (12:25 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 1 Sep 2020 10:26:18 +0000 (12:26 +0200)
* PHP-7.4:
  Fix pi node removal when removing predecessor

1  2 
Zend/tests/remove_predecessor_of_pi_node.phpt
ext/opcache/Optimizer/zend_ssa.c

index 0000000000000000000000000000000000000000,2346d5aa522ef427fb510d2bb3dda7a75e73c392..6231f08b3f626280c4a96ffe179e0ef52df5ac72
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,14 +1,14 @@@
 -Notice: Undefined variable: n in %s on line %d
+ --TEST--
+ Regression test for incorrect update of pi node users when removing a predecessor block
+ --FILE--
+ <?php
+ function test() {
+     for (; $n--; )
+         C;
+ }
+ test();
+ ?>
+ --EXPECTF--
++Warning: Undefined variable $n in %s on line %d
Simple merge