com php-src: Fixed optimizer: ext/opcache/Optimizer/pass1_ 5.c ext/opcache/Optimizer/zend_optimizer.c
| From: | Dmitry Stogov | Date: | Tue, 01 Apr 2014 07:04:12 +0000 |
| Subject: | com php-src: Fixed optimizer: ext/opcache/Optimizer/pass1_ 5.c ext/opcache/Optimizer/zend_optimizer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77510@lists.php.net to get a copy of this message | ||
Commit: 2a612e91c253b5546e8a2d611f3dd8faa47fec7c
Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 11:04:12 +0400
Parents: b964621294d6cf026d6f60ba8c7f257222d1d0f2
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a612e91c253b5546e8a2d611f3dd8faa47fec7c
Log:
Fixed optimizer
Changed paths:
M ext/opcache/Optimizer/pass1_5.c
M ext/opcache/Optimizer/zend_optimizer.c
Diff:
diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c
index 7c32acd..221fd0f 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 1262cc2..55f5720 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++;