Fix child names for virtual nodes

Author: nikic

ast.c

@@ -166,7 +166,7 @@ static inline zend_ast **ast_get_children(zend_ast *ast, uint32_t *count) {
 }
 
 static void ast_create_virtual_node(
-		zval *zv, zend_ast_kind kind, zend_ast *ast, zend_string *child_name) {
+		zval *zv, zend_ast_kind kind, zend_ast *ast, zend_long version) {
 	zval tmp_zv, tmp_zv2;
 
 	object_init_ex(zv, ast_node_ce);
@@ -184,8 +184,8 @@ static void ast_create_virtual_node(
 	ast_update_property(zv, AST_STR(children), &tmp_zv, AST_CACHE_SLOT_CHILDREN);
 
 	ZVAL_COPY(&tmp_zv2, zend_ast_get_zval(ast));
-	if (child_name) {
-		zend_hash_add_new(Z_ARRVAL(tmp_zv), child_name, &tmp_zv2);
+	if (version >= 30) {
+		zend_hash_add_new(Z_ARRVAL(tmp_zv), ast_kind_child_name(kind, 0), &tmp_zv2);
 	} else {
 		zend_hash_next_index_insert(Z_ARRVAL(tmp_zv), &tmp_zv2);
 	}
@@ -304,9 +304,9 @@ static void ast_to_zval(zval *zv, zend_ast *ast, zend_long version) {
 			zval child_zv;
 
 			if (ast_is_name(child, ast, i)) {
-				ast_create_virtual_node(&child_zv, AST_NAME, child, child_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, child_name);
+				ast_create_virtual_node(&child_zv, AST_CLOSURE_VAR, child, version);
 			} else {
 				ast_to_zval(&child_zv, child, version);
 			}

tests/named_children.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Named child nodes
+--FILE--
+<?php
+
+require __DIR__ . '/../util.php';
+
+$code = <<<'PHP'
+<?php
+
+$fn = function() use(&$var) {
+    $var += func();
+};
+PHP;
+
+echo ast_dump(ast\parse_code($code, $version=30));
+
+?>
+--EXPECT--
+AST_STMT_LIST
+    0: AST_ASSIGN
+        var: AST_VAR
+            name: "fn"
+        expr: AST_CLOSURE
+            flags: 0
+            name: {closure}
+            params: AST_PARAM_LIST
+            uses: AST_CLOSURE_USES
+                0: AST_CLOSURE_VAR
+                    flags: 1
+                    name: "var"
+            stmts: AST_STMT_LIST
+                0: AST_ASSIGN_OP
+                    flags: BINARY_ADD (1)
+                    var: AST_VAR
+                        name: "var"
+                    expr: AST_CALL
+                        expr: AST_NAME
+                            flags: NAME_NOT_FQ (1)
+                            name: "func"
+                        args: AST_ARG_LIST
+            returnType: null