Fixed optimizer

diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c
index 7c32acd34f12b5ff9099d530d7160b3feeec1c25..221fd0f1f293a303b4f7e62de422dc8f991762c6 100644 (file)
--- 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 1262cc222bbe954f64c5262111fbbead7ea3b815..55f57207e7eadd0a6fc65b066b18ae74f5a76fb4 100644 (file)
--- 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++;