Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)

2 files changed, 51 insertions, 44 deletions

diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 8996e76f63..0a7b1ded0f 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -643,8 +643,11 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array,
 			opline->opcode != ZEND_FREE
 			) {
 			zend_op *src = VAR_SOURCE(opline->op1);
+			zval c = ZEND_OP1_LITERAL(src);
 			VAR_UNSET(opline->op1);
-			COPY_NODE(opline->op1, src->op1);
+			zval_copy_ctor(&c);
+			update_op1_const(op_array, opline, &c TSRMLS_CC);
+			literal_dtor(&ZEND_OP1_LITERAL(src));
 			MAKE_NOP(src);
 		}
 
@@ -654,51 +657,12 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array,
 			VAR_SOURCE(opline->op2)->opcode == ZEND_QM_ASSIGN &&
 			ZEND_OP1_TYPE(VAR_SOURCE(opline->op2)) == IS_CONST) {
 			zend_op *src = VAR_SOURCE(opline->op2);
+			zval c = ZEND_OP1_LITERAL(src);
 			VAR_UNSET(opline->op2);
-			COPY_NODE(opline->op2, src->op1);
+			zval_copy_ctor(&c);
+			update_op2_const(op_array, opline, &c TSRMLS_CC);
+			literal_dtor(&ZEND_OP1_LITERAL(src));
 			MAKE_NOP(src);
-
-#if ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO
-			/* numeric string constants used as array indeces have to be
-			   converted to long at compile time */
-			if (opline->opcode == ZEND_ADD_ARRAY_ELEMENT ||
-			    opline->opcode == ZEND_INIT_ARRAY ||
-			    opline->opcode == ZEND_UNSET_DIM ||
-			    opline->opcode == ZEND_ISSET_ISEMPTY_DIM_OBJ ||
-			    opline->opcode == ZEND_FETCH_DIM_R ||
-			    opline->opcode == ZEND_FETCH_DIM_W ||
-			    opline->opcode == ZEND_FETCH_DIM_RW ||
-			    opline->opcode == ZEND_FETCH_DIM_IS ||
-			    opline->opcode == ZEND_FETCH_DIM_FUNC_ARG ||
-			    opline->opcode == ZEND_FETCH_DIM_UNSET ||
-			    opline->opcode == ZEND_FETCH_DIM_TMP_VAR ||
-			    (opline->opcode == ZEND_OP_DATA &&
-			     ((opline-1)->opcode == ZEND_ASSIGN_DIM ||
-			      ((opline-1)->extended_value == ZEND_ASSIGN_DIM &&
-			       ((opline-1)->opcode == ZEND_ASSIGN_ADD ||
-			        (opline-1)->opcode == ZEND_ASSIGN_SUB ||
-			        (opline-1)->opcode == ZEND_ASSIGN_MUL ||
-			        (opline-1)->opcode == ZEND_ASSIGN_DIV ||
-			        (opline-1)->opcode == ZEND_ASSIGN_MOD ||
-			        (opline-1)->opcode == ZEND_ASSIGN_SL ||
-			        (opline-1)->opcode == ZEND_ASSIGN_SR ||
-			        (opline-1)->opcode == ZEND_ASSIGN_CONCAT ||
-			        (opline-1)->opcode == ZEND_ASSIGN_BW_OR ||
-			        (opline-1)->opcode == ZEND_ASSIGN_BW_AND ||
-			        (opline-1)->opcode == ZEND_ASSIGN_BW_XOR))))) {
-
-				if (Z_TYPE(ZEND_OP2_LITERAL(opline)) == IS_STRING) {
-					ulong index;
-					int numeric = 0;
-
-					ZEND_HANDLE_NUMERIC_EX(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline))+1, index, numeric = 1);
-					if (numeric) {
-						zval_dtor(&ZEND_OP2_LITERAL(opline));
-						ZVAL_LONG(&ZEND_OP2_LITERAL(opline), index);
-		        	}
-				}
-			}
-#endif
 		}
 
 		/* T = PRINT(X), F(T) => ECHO(X), F(1) */
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 60423dfeaa..68184d9db4 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -248,6 +248,49 @@ static void update_op2_const(zend_op_array *op_array,
 					op_array->last_cache_slot += 2;

 				}

 				break;

+#if ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO

+			case ZEND_OP_DATA:

+				if ((opline-1)->opcode == ZEND_ASSIGN_DIM ||

+				    ((opline-1)->extended_value == ZEND_ASSIGN_DIM &&

+				     ((opline-1)->opcode == ZEND_ASSIGN_ADD ||

+				     (opline-1)->opcode == ZEND_ASSIGN_SUB ||

+				     (opline-1)->opcode == ZEND_ASSIGN_MUL ||

+				     (opline-1)->opcode == ZEND_ASSIGN_DIV ||

+				     (opline-1)->opcode == ZEND_ASSIGN_MOD ||

+				     (opline-1)->opcode == ZEND_ASSIGN_SL ||

+				     (opline-1)->opcode == ZEND_ASSIGN_SR ||

+				     (opline-1)->opcode == ZEND_ASSIGN_CONCAT ||

+				     (opline-1)->opcode == ZEND_ASSIGN_BW_OR ||

+				     (opline-1)->opcode == ZEND_ASSIGN_BW_AND ||

+				     (opline-1)->opcode == ZEND_ASSIGN_BW_XOR))) {

+					goto check_numeric;

+				}

+				break;

+			case ZEND_ISSET_ISEMPTY_DIM_OBJ:

+			case ZEND_ADD_ARRAY_ELEMENT:

+			case ZEND_INIT_ARRAY:

+			case ZEND_UNSET_DIM:

+			case ZEND_FETCH_DIM_R:

+			case ZEND_FETCH_DIM_W:

+			case ZEND_FETCH_DIM_RW:

+			case ZEND_FETCH_DIM_IS:

+			case ZEND_FETCH_DIM_FUNC_ARG:

+			case ZEND_FETCH_DIM_UNSET:

+			case ZEND_FETCH_DIM_TMP_VAR:

+check_numeric:

+				{

+					ulong index;

+					int numeric = 0;

+

+					ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(val), Z_STRLEN_P(val)+1, index, numeric = 1);

+					if (numeric) {

+						zval_dtor(val);

+						ZVAL_LONG(val, index);

+						op_array->literals[opline->op2.constant].constant = *val;

+		        	}

+				}

+				break;

+#endif

 			default:

 				break;

 		}