com php-src: ZEND_STRLEN and ZEND_DEFINED have IS _VAR results for now: ext/opcache/Optimizer/pass1 _5.c

Commit: 99878ced1565ba68fa7f7441d6bc8e1c7480bb39 Author: Nikita Popov <nikic@php.net> Fri, 15 Aug 2014 22:07:46 +0200 Parents: fbef2af2c3ac756015d7a8d8bd46dc3096652bbe Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99878ced1565ba68fa7f7441d6bc8e1c7480bb39 Log: ZEND_STRLEN and ZEND_DEFINED have IS_VAR results for now This avoids issues with calls being expected to have an IS_VAR result Changed paths: M ext/opcache/Optimizer/pass1_5.c Diff: diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c index b2e5b1c..5c6f8ef 100644 --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@ -463,7 +463,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) { zval t; ZVAL_LONG(&t, Z_STRLEN(ZEND_OP1_LITERAL(opline))); - replace_tmp_by_const(op_array, opline + 1, ZEND_RESULT(opline)..var, &t TSRMLS_CC); + replace_var_by_const(op_array, opline + 1, ZEND_RESULT(opline).var, &t TSRMLS_CC); literal_dtor(&ZEND_OP1_LITERAL(opline)); MAKE_NOP(opline); } @@ -476,7 +476,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) { break; } ZVAL_TRUE(&c); - replace_tmp_by_const(op_array, opline, tv, &c TSRMLS_CC); + replace_var_by_const(op_array, opline, tv, &c TSRMLS_CC); literal_dtor(&ZEND_OP1_LITERAL(opline)); MAKE_NOP(opline); }