]> granicus.if.org Git - php/commitdiff
convert_to_string also does the check
authorXinchen Hui <laruence@php.net>
Mon, 10 Nov 2014 15:41:55 +0000 (23:41 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 10 Nov 2014 15:41:55 +0000 (23:41 +0800)
Zend/zend_compile.c

index d66ed5db3573484fcf016bb774109c37e1f719ed..ebbb0050883c8ff56839a8bdbfa3f55107c82d96 100644 (file)
@@ -2985,9 +2985,7 @@ void zend_compile_global_var(zend_ast *ast TSRMLS_DC) /* {{{ */
 
        zend_compile_expr(&name_node, name_ast TSRMLS_CC);
        if (name_node.op_type == IS_CONST) {
-               if (Z_TYPE(name_node.u.constant) != IS_STRING) {
-                       convert_to_string(&name_node.u.constant);
-               }
+               convert_to_string(&name_node.u.constant);
        }
 
        if (zend_try_compile_cv(&result, var_ast TSRMLS_CC) == SUCCESS) {