com php-src: Add an assertion: ext/opcache/Optimizer/zend_opt imizer.c

From: Date: Fri, 16 Dec 2016 03:09:22 +0000
Subject: com php-src: Add an assertion: ext/opcache/Optimizer/zend_opt imizer.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-96339@lists.php.net to get a copy of this message
Commit: 8ba7878f1b88f760d1cf483321e2ac1b27a93c58 Author: Xinchen Hui <laruence@gmail.com> Fri, 16 Dec 2016 11:09:22 +0800 Parents: 7cef66c6352eb6398517fcf3acde128052e0fbd9 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8ba7878f1b88f760d1cf483321e2ac1b27a93c58 Log: Add an assertion Changed paths: M ext/opcache/Optimizer/zend_optimizer.c Diff: diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index ef79eb8..fa86b99 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -514,10 +514,13 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array, return 0; } MAKE_NOP(opline); + /* zend_handle_loops_and_finally may inserts other oplines */ do { ++opline; } while (opline->opcode != ZEND_RETURN && opline->opcode != ZEND_RETURN_BY_REF); + ZEND_ASSERT(ZEND_OP1(opline).var == var); + break; } default:

« previous php.cvs (#96339) next »