From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 17 Dec 2015 06:30:00 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.2RC1~11^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9374977d215be414d6e2e98b041a2b8f9b9a1e8d;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/opcache/Optimizer/pass1_5.c
---

9374977d215be414d6e2e98b041a2b8f9b9a1e8d
diff --cc ext/opcache/Optimizer/pass1_5.c
index 5ea10a88d8,f252117de7..7e0d14ac60
--- 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) {