Normalize ('\bar')() by removing leading backslash

Author: nikic

README.md

@@ -417,6 +417,9 @@ Version changelog
 ### 40 (in development)
 
 * `AST_COALESCE` is now represented as an `AST_BINARY_OP` with flag `BINARY_COALESCE`.
+* For `AST_NAME` nodes with `NAME_FQ` the leading backslash is now dropped if syntax like
+  `('\bar')()` is used. Previously this would return the name as `'\bar'`, while a normal `\bar()`
+  call would return it as `'bar'`. Now always the latter form is used.
 
 ### 30 (current)
 

ast.c

@@ -218,6 +218,18 @@ static void ast_fill_children_ht(HashTable *ht, zend_ast *ast, zend_long version
 		}
 
 		if (ast_is_name(child, ast, i)) {
+			if (version >= 40 && child->attr == ZEND_NAME_FQ) {
+				/* Ensure there is no leading \ for fully-qualified names. This can happen if
+				 * something like ('\bar')() is used. */
+				zval *name = zend_ast_get_zval(child);
+				if (Z_STRVAL_P(name)[0] == '\\') {
+					zend_string *new_name = zend_string_init(
+						Z_STRVAL_P(name) + 1, Z_STRLEN_P(name) - 1, 0);
+					zend_string_release(Z_STR_P(name));
+					Z_STR_P(name) = new_name;
+				}
+			}
+
 			ast_create_virtual_node(&child_zv, AST_NAME, child, version);
 		} else if (ast->kind == ZEND_AST_CLOSURE_USES) {
 			ast_create_virtual_node(&child_zv, AST_CLOSURE_VAR, child, version);

tests/name_node.phpt

@@ -0,0 +1,62 @@
+--TEST--
+Name nodes
+--FILE--
+<?php
+
+require __DIR__ . '/../util.php';
+
+$code = <<<'PHP'
+<?php
+foo();
+\foo();
+('foo')();
+('\foo')();
+PHP;
+
+echo ast_dump(ast\parse_code($code, $version=30)), "\n";
+echo ast_dump(ast\parse_code($code, $version=40)), "\n";
+
+?>
+--EXPECT--
+AST_STMT_LIST
+    0: AST_CALL
+        expr: AST_NAME
+            flags: NAME_NOT_FQ (1)
+            name: "foo"
+        args: AST_ARG_LIST
+    1: AST_CALL
+        expr: AST_NAME
+            flags: NAME_FQ (0)
+            name: "foo"
+        args: AST_ARG_LIST
+    2: AST_CALL
+        expr: AST_NAME
+            flags: NAME_FQ (0)
+            name: "foo"
+        args: AST_ARG_LIST
+    3: AST_CALL
+        expr: AST_NAME
+            flags: NAME_FQ (0)
+            name: "\foo"
+        args: AST_ARG_LIST
+AST_STMT_LIST
+    0: AST_CALL
+        expr: AST_NAME
+            flags: NAME_NOT_FQ (1)
+            name: "foo"
+        args: AST_ARG_LIST
+    1: AST_CALL
+        expr: AST_NAME
+            flags: NAME_FQ (0)
+            name: "foo"
+        args: AST_ARG_LIST
+    2: AST_CALL
+        expr: AST_NAME
+            flags: NAME_FQ (0)
+            name: "foo"
+        args: AST_ARG_LIST
+    3: AST_CALL
+        expr: AST_NAME
+            flags: NAME_FQ (0)
+            name: "foo"
+        args: AST_ARG_LIST