diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-06-15 22:50:04 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-06-15 22:50:04 +0300 |
| commit | 8bb29704ea34749d1560f424c4726f4162d1adee (patch) | |
| tree | 8e9195a3be9001456b495f7a8248c689d64030f5 /Zend/zend_ast.c | |
| parent | 76db01d9ff213aec3f5f0e532c67c6ea8c4b5751 (diff) | |
| download | php-git-8bb29704ea34749d1560f424c4726f4162d1adee.tar.gz | |
Refactored API for constant array element propagation
Diffstat (limited to 'Zend/zend_ast.c')
| -rw-r--r-- | Zend/zend_ast.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index a4d32d8d77..c19a47f037 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -432,11 +432,7 @@ ZEND_API int zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *sc } else { zval tmp; - if (ast->attr == ZEND_DIM_IS) { - zend_fetch_dimension_by_zval_is(&tmp, &op1, &op2, IS_CONST); - } else { - zend_fetch_dimension_by_zval(&tmp, &op1, &op2); - } + zend_fetch_dimension_const(&tmp, &op1, &op2, (ast->attr == ZEND_DIM_IS) ? BP_VAR_IS : BP_VAR_R); if (UNEXPECTED(Z_ISREF(tmp))) { ZVAL_DUP(result, Z_REFVAL(tmp)); |