com php-src: Merge branch 'PHP-5.6' into PHP-7.0: .gitignore ext/opcache/Optimizer/pass1_5.c main/internal_funct ions_win32.c php.ini-development
php.ini-produc tion
| From: | Xinchen Hui | Date: | Thu, 17 Dec 2015 06:30:00 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: .gitignore ext/opcache/Optimizer/pass1_5.c main/internal_funct ions_win32.c php.ini-development php.ini-produc tion |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90309@lists.php.net to get a copy of this message | ||
Commit: 9374977d215be414d6e2e98b041a2b8f9b9a1e8d
Author: Xinchen Hui <laruence@gmail.com> Thu, 17 Dec 2015 14:30:00 +0800
Parents: c7c3b967a550b4f1137d6a7b2bf56ec1e4f6dbbd 940c68b55d4241f9f34d4f71064f5f12a44e8d3d
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9374977d215be414d6e2e98b041a2b8f9b9a1e8d
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Changed paths:
MM .gitignore
MM ext/opcache/Optimizer/pass1_5.c
MM main/internal_functions_win32.c
MM php.ini-development
MM php.ini-production
Diff:
diff --cc ext/opcache/Optimizer/pass1_5.c
index 5ea10a8,f252117..7e0d14a
--- a/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@@ -42,7 -16,9 +42,9 @@@ void zend_optimizer_pass1(zend_op_arra
int i = 0;
zend_op *opline = op_array->opcodes;
zend_op *end = opline + op_array->last;
- zend_bool collect_constants = (op_array == &ctx->script->main_op_array);
+ /* bug #71127*
- zend_bool collect_constants = (op_array == &script->main_op_array); */
++ zend_bool collect_constants = (op_array == &ctx->script->main_op_array); */
+ zend_bool collect_constants = 0;
while (opline < end) {
switch (opline->opcode) {