Merge branch 'master' of git.php.net:php-src

Author: laruence

ext/opcache/Optimizer/block_pass.c

@@ -1654,13 +1654,15 @@ static void zend_jmp_optimization(zend_code_block *block, zend_op_array *op_arra
 				}
 			} else if (block->op2_to == block->ext_to) {
 				/* both goto the same one - it's JMP */
-				/* JMPZNZ(?,L,L) -> JMP(L) */
-				last_op->opcode = ZEND_JMP;
-				SET_UNUSED(last_op->op1);
-				SET_UNUSED(last_op->op2);
-				block->op1_to = block->op2_to;
-				block->op2_to = NULL;
-				block->ext_to = NULL;
+				if (!(last_op->op1_type & (IS_VAR|IS_TMP_VAR))) {
+					/* JMPZNZ(?,L,L) -> JMP(L) */
+					last_op->opcode = ZEND_JMP;
+					SET_UNUSED(last_op->op1);
+					SET_UNUSED(last_op->op2);
+					block->op1_to = block->op2_to;
+					block->op2_to = NULL;
+					block->ext_to = NULL;
+				}
 			} else if (block->op2_to == next) {
 				/* jumping to next on Z - can follow to it and jump only on NZ */
 				/* JMPZNZ(X,L1,L2) L1: -> JMPNZ(X,L2) */

ext/opcache/tests/bug695449.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$a = array(true);
+if($a[0] && false) {
+  echo 'test';
+}
+echo "ok\n";
+?>
+--EXPECT--
+ok