com php-src: Numeric string constants used as array indeces have to be converted to long at compile time: ext/opcache/Optimizer/block _pass.c
| From: | Dmitry Stogov | Date: | Wed, 10 Apr 2013 11:33:08 +0000 |
| Subject: | com php-src: Numeric string constants used as array indeces have to be converted to long at compile time: ext/opcache/Optimizer/block _pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71907@lists.php.net to get a copy of this message | ||
Commit: 7845f49006cbe7876a7e28db54acbc8cde284986
Author: Dmitry Stogov <dmitry@zend.com> Wed, 10 Apr 2013 15:33:08 +0400
Parents: 2e3e87029fe464bb61dd0a18a6af59c30527e9e4
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7845f49006cbe7876a7e28db54acbc8cde284986
Log:
Numeric string constants used as array indeces have to be converted to long at compile time
Changed paths:
M ext/opcache/Optimizer/block_pass.c
Diff:
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 05cb15a..d46ac0e 100644
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -612,6 +612,46 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array
*op_array,
VAR_UNSET(opline->op2);
COPY_NODE(opline->op2, src->op1);
MAKE_NOP(src);
+
+ /* 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);
+ }
+ }
+ }
}
/* T = PRINT(X), F(T) => ECHO(X), F(1) */