com php-src: fixed incorrect bitmask: ext/opcache/Optimizer/pas s1_5.c
| From: | Dmitry Stogov | Date: | Wed, 28 Oct 2015 18:26:52 +0000 |
| Subject: | com php-src: fixed incorrect bitmask: ext/opcache/Optimizer/pas s1_5.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89556@lists.php.net to get a copy of this message | ||
Commit: 3b44e40277a9e623df3f4389d3ebd42e495735cb
Author: Dmitry Stogov <dmitry@zend.com> Wed, 28 Oct 2015 16:06:08 +0300
Parents: b009f84ec0feb3e9b2d93f9cff3304c8acb0bf4c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3b44e40277a9e623df3f4389d3ebd42e495735cb
Log:
fixed incorrect bitmask
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 0122342..0e41360 100644
--- a/ext/opcache/Optimizer/pass1_5.c
+++ b/ext/opcache/Optimizer/pass1_5.c
@@ -308,14 +308,14 @@ void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx)
}
} else if (op_array->scope &&
ZEND_OP1_TYPE(opline) == IS_UNUSED &&
- (opline->op1.num & ~ZEND_FETCH_CLASS_NO_AUTOLOAD) == ZEND_FETCH_CLASS_SELF) {
+ (opline->op1.num & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF) {
/* for self::B */
ce = op_array->scope;
} else if (op_array->scope &&
ZEND_OP1_TYPE(opline) == IS_VAR &&
(opline - 1)->opcode == ZEND_FETCH_CLASS &&
(ZEND_OP1_TYPE(opline - 1) == IS_UNUSED &&
- ((opline - 1)->extended_value & ~ZEND_FETCH_CLASS_NO_AUTOLOAD) ==
ZEND_FETCH_CLASS_SELF) &&
+ ((opline - 1)->extended_value & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_SELF)
&&
ZEND_RESULT((opline - 1)).var == ZEND_OP1(opline).var) {
/* for self::B */
ce = op_array->scope;