com php-src: Fix build: Zend/zend_compile.c
| From: | Nikita Popov | Date: | Sat, 24 Jan 2015 18:53:07 +0000 |
| Subject: | com php-src: Fix build: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84355@lists.php.net to get a copy of this message | ||
Commit: 8dc1287739cd5539a74f950c3c4813461e1de05d
Author: Nikita Popov <nikic@php.net> Sat, 24 Jan 2015 19:53:07 +0100
Parents: f3675d950d8b9847ed390e7a4d2d94d992909845
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8dc1287739cd5539a74f950c3c4813461e1de05d
Log:
Fix build
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 77dd639..9e43fdf 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5731,8 +5731,8 @@ void zend_compile_class_const(znode *result, zend_ast *ast) /* {{{ */
zend_compile_expr(&const_node, const_ast);
- if (class_op && const_node.op_type == IS_CONST && class_op->extended_value ==
ZEND_FETCH_CLASS_SELF && Z_TYPE(const_node.u.constant) == IS_STRING)
- zval *const_zv = zend_hash_find(&CG(active_class_entry)->constants_table,
Z_STR(const_node.u.constant))
+ if (class_op && const_node.op_type == IS_CONST && class_op->extended_value ==
ZEND_FETCH_CLASS_SELF && Z_TYPE(const_node.u.constant) == IS_STRING) {
+ zval *const_zv = zend_hash_find(&CG(active_class_entry)->constants_table,
Z_STR(const_node.u.constant));
if (const_zv && Z_TYPE_P(const_zv) < IS_CONSTANT) {
CG(active_op_array)->last--;
CG(active_op_array)->T--;