com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.c Zend/zend_compile.h Zend/zend_globals.h
| From: | Nikita Popov | Date: | Thu, 28 Mar 2019 08:31:18 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.c Zend/zend_compile.h Zend/zend_globals.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105380@lists.php.net to get a copy of this message | ||
Commit: 0720313bd452adf451173574e97fd761f90623a2
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 28 Mar 2019 09:31:18 +0100
Parents: 379e3cb8e32dcd7ef23e7108b60dadd4bc38e059 7f72d771e8581bfff7856b46ae9fb8555b061118
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0720313bd452adf451173574e97fd761f90623a2
Log:
Merge branch 'PHP-7.4'
Changed paths:
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_globals.h
Diff:
diff --cc Zend/zend_compile.c
index 3cb1720,2fa847d..23b6759
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -7944,8 -8067,7 +7940,8 @@@ void zend_compile_const_expr_const(zend
}
zend_ast_destroy(ast);
- *ast_ptr = zend_ast_create_constant(&loc, resolved_name,
- *ast_ptr = zend_ast_create_constant(resolved_name, !is_fully_qualified ? IS_CONSTANT_UNQUALIFIED
: 0);
++ *ast_ptr = zend_ast_create_constant(resolved_name,
+ !is_fully_qualified && FC(current_namespace) ? IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE :
0);
}
/* }}} */