Index: cfe/trunk/lib/AST/ASTDumper.cpp =================================================================== --- cfe/trunk/lib/AST/ASTDumper.cpp +++ cfe/trunk/lib/AST/ASTDumper.cpp @@ -1951,11 +1951,12 @@ OS << " field "; NodeDumper.dumpBareDeclRef(Field); } + if (auto *Filler = ILE->getArrayFiller()) { - dumpChild([=] { - OS << "array filler"; - dumpStmt(Filler); - }); + OS << " array_filler"; + NodeDumper.dumpPointer(Filler); + + dumpStmt(Filler); } } Index: cfe/trunk/test/AST/ast-dump-stmt.cpp =================================================================== --- cfe/trunk/test/AST/ast-dump-stmt.cpp +++ cfe/trunk/test/AST/ast-dump-stmt.cpp @@ -90,9 +90,8 @@ { U us[3] = {1}; // CHECK: VarDecl {{.+}} col:5 us 'U [3]' cinit -// CHECK-NEXT: `-InitListExpr {{.+}} 'U [3]' -// CHECK-NEXT: |-array filler -// CHECK-NEXT: | `-InitListExpr {{.+}} 'U' field Field {{.+}} 'i' 'int' +// CHECK-NEXT: `-InitListExpr {{.+}} 'U [3]' array_filler 0x{{.+}} +// CHECK-NEXT: |-InitListExpr {{.+}} 'U' field Field {{.+}} 'i' 'int' // CHECK-NEXT: `-InitListExpr {{.+}} 'U' field Field {{.+}} 'i' 'int' // CHECK-NEXT: `-IntegerLiteral {{.+}} 'int' 1 }