From 2a612e91c253b5546e8a2d611f3dd8faa47fec7c Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 1 Apr 2014 11:04:12 +0400 Subject: [PATCH] Fixed optimizer --- ext/opcache/Optimizer/pass1_5.c | 2 +- ext/opcache/Optimizer/zend_optimizer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c index 7c32acd34f..221fd0f1f2 100644 --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@ -494,7 +494,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) { #endif collect_constants = 0; break; -#if 0 //???ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO +#if ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO case ZEND_FETCH_R: case ZEND_FETCH_W: case ZEND_FETCH_RW: diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index 1262cc222b..55f57207e7 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -68,7 +68,7 @@ static int zend_optimizer_lookup_cv(zend_op_array *op_array, zend_string* name) if (op_array->vars[i] == name || (op_array->vars[i]->h == hash_value && op_array->vars[i]->len == name->len && - memcmp(op_array->vars[i], name->val, name->len) == 0)) { + memcmp(op_array->vars[i]->val, name->val, name->len) == 0)) { return (int)EX_VAR_NUM_2(NULL, i); } i++; -- 2.50.1