https://github.com/yronglin updated
https://github.com/llvm/llvm-project/pull/88269
>From 26b87c38856f2840a3a6a2487834f3b677aa14b9 Mon Sep 17 00:00:00 2001
From: yronglin <yronglin...@gmail.com>
Date: Wed, 10 Apr 2024 21:38:40 +0800
Subject: [PATCH 1/2] [Clang] Fix AST dump for {CXXDefaultArgExpr,
CXXDefaultInitExpr}
Signed-off-by: yronglin <yronglin...@gmail.com>
---
clang/include/clang/AST/ASTNodeTraverser.h | 8 +++++++
clang/lib/AST/TextNodeDumper.cpp | 14 ++---------
clang/test/AST/ast-dump-default-init.cpp | 24 +++++++++++++++++++
.../test/AST/ast-dump-for-range-lifetime.cpp | 21 ++++++++++++++++
clang/unittests/AST/ASTTraverserTest.cpp | 8 +++++++
5 files changed, 63 insertions(+), 12 deletions(-)
create mode 100644 clang/test/AST/ast-dump-default-init.cpp
diff --git a/clang/include/clang/AST/ASTNodeTraverser.h
b/clang/include/clang/AST/ASTNodeTraverser.h
index 94e7dd817809dd..a6e3b05b005968 100644
--- a/clang/include/clang/AST/ASTNodeTraverser.h
+++ b/clang/include/clang/AST/ASTNodeTraverser.h
@@ -932,6 +932,14 @@ class ASTNodeTraverser
Visit(TArg);
}
+ void VisitCXXDefaultArgExpr(const CXXDefaultArgExpr *Node) {
+ Visit(Node->getExpr());
+ }
+
+ void VisitCXXDefaultInitExpr(const CXXDefaultInitExpr *Node) {
+ Visit(Node->getExpr());
+ }
+
// Implements Visit methods for Attrs.
#include "clang/AST/AttrNodeTraverse.inc"
};
diff --git a/clang/lib/AST/TextNodeDumper.cpp b/clang/lib/AST/TextNodeDumper.cpp
index 431f5d8bdb2b5f..830d3ff0faebd4 100644
--- a/clang/lib/AST/TextNodeDumper.cpp
+++ b/clang/lib/AST/TextNodeDumper.cpp
@@ -1439,23 +1439,13 @@ void TextNodeDumper::VisitExpressionTraitExpr(const
ExpressionTraitExpr *Node) {
}
void TextNodeDumper::VisitCXXDefaultArgExpr(const CXXDefaultArgExpr *Node) {
- if (Node->hasRewrittenInit()) {
+ if (Node->hasRewrittenInit())
OS << " has rewritten init";
- AddChild([=] {
- ColorScope Color(OS, ShowColors, StmtColor);
- Visit(Node->getExpr());
- });
- }
}
void TextNodeDumper::VisitCXXDefaultInitExpr(const CXXDefaultInitExpr *Node) {
- if (Node->hasRewrittenInit()) {
+ if (Node->hasRewrittenInit())
OS << " has rewritten init";
- AddChild([=] {
- ColorScope Color(OS, ShowColors, StmtColor);
- Visit(Node->getExpr());
- });
- }
}
void TextNodeDumper::VisitMaterializeTemporaryExpr(
diff --git a/clang/test/AST/ast-dump-default-init.cpp
b/clang/test/AST/ast-dump-default-init.cpp
new file mode 100644
index 00000000000000..a2ce4ba57aa968
--- /dev/null
+++ b/clang/test/AST/ast-dump-default-init.cpp
@@ -0,0 +1,24 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -ast-dump %s |
FileCheck %s
+
+// CXXDefaultArgExpr should inherit dependence from the inner Expr, in this
case
+// RecoveryExpr.
+
+struct A {
+ int arr[1];
+};
+
+struct B {
+ const A &a = A{{0}};
+};
+
+void test() {
+ B b{};
+}
+// CHECK: -CXXDefaultInitExpr 0x{{[^ ]*}} <{{.*}}> 'const A' lvalue has
rewritten init
+// CHECK-NEXT: `-ExprWithCleanups 0x{{[^ ]*}} <{{.*}}> 'const A' lvalue
+// CHECK-NEXT: `-MaterializeTemporaryExpr 0x{{[^ ]*}} <{{.*}}> 'const A'
lvalue extended by Var 0x{{[^ ]*}} 'b' 'B'
+// CHECK-NEXT: `-ImplicitCastExpr 0x{{[^ ]*}} <{{.*}}> 'const A' <NoOp>
+// CHECK-NEXT: `-CXXFunctionalCastExpr 0x{{[^ ]*}} <{{.*}}> 'A'
functional cast to A <NoOp>
+// CHECK-NEXT: `-InitListExpr 0x{{[^ ]*}} <{{.*}}> 'A'
+// CHECK-NEXT: `-InitListExpr 0x{{[^ ]*}} <{{.*}}> 'int[1]'
+// CHECK-NEXT: `-IntegerLiteral 0x{{[^ ]*}} <{{.*}}> 'int' 0
diff --git a/clang/test/AST/ast-dump-for-range-lifetime.cpp
b/clang/test/AST/ast-dump-for-range-lifetime.cpp
index 88b838268be2e0..0e92b6990ed504 100644
--- a/clang/test/AST/ast-dump-for-range-lifetime.cpp
+++ b/clang/test/AST/ast-dump-for-range-lifetime.cpp
@@ -132,6 +132,9 @@ void test4() {
// CHECK-NEXT: | | `-DeclRefExpr {{.*}} 'int (&(const A &))[3]'
lvalue Function {{.*}} 'default_arg_fn' 'int (&(const A &))[3]'
// CHECK-NEXT: | `-CXXDefaultArgExpr {{.*}} <<invalid sloc>> 'const
A':'const P2718R0::A' lvalue has rewritten init
// CHECK-NEXT: | `-MaterializeTemporaryExpr {{.*}} 'const A':'const
P2718R0::A' lvalue extended by Var {{.*}} '__range1' 'int (&)[3]'
+ // CHECK-NEXT: | `-ImplicitCastExpr {{.*}} 'const A':'const
P2718R0::A' <NoOp>
+ // CHECK-NEXT: | `-CXXBindTemporaryExpr {{.*}} 'A':'P2718R0::A'
(CXXTemporary {{.*}})
+ // CHECK-NEXT: | `-CXXTemporaryObjectExpr {{.*}}
'A':'P2718R0::A' 'void ()'
for (auto e : default_arg_fn())
bar(e);
}
@@ -179,10 +182,19 @@ void test5() {
// CHECK-NEXT: | | | |
`-CXXTemporaryObjectExpr {{.*}} 'A':'P2718R0::A' 'void ()'
// CHECK-NEXT: | | | `-CXXDefaultArgExpr {{.*}}
<<invalid sloc>> 'const DefaultA':'const P2718R0::DefaultA' lvalue has
rewritten init
// CHECK-NEXT: | | | `-MaterializeTemporaryExpr
{{.*}} 'const DefaultA':'const P2718R0::DefaultA' lvalue extended by Var {{.*}}
'__range1' 'int (&)[3]'
+ // CHECK-NEXT: | | | `-ImplicitCastExpr
{{.*}} 'const DefaultA':'const P2718R0::DefaultA' <NoOp>
+ // CHECK-NEXT: | | | `-CXXBindTemporaryExpr
{{.*}} 'DefaultA':'P2718R0::DefaultA' (CXXTemporary {{.*}})
+ // CHECK-NEXT: | | |
`-CXXTemporaryObjectExpr {{.*}} 'DefaultA':'P2718R0::DefaultA' 'void ()'
// CHECK-NEXT: | | `-CXXDefaultArgExpr {{.*}} <<invalid
sloc>> 'const DefaultA':'const P2718R0::DefaultA' lvalue has rewritten init
// CHECK-NEXT: | | `-MaterializeTemporaryExpr {{.*}}
'const DefaultA':'const P2718R0::DefaultA' lvalue extended by Var {{.*}}
'__range1' 'int (&)[3]'
+ // CHECK-NEXT: | | `-ImplicitCastExpr {{.*}} 'const
DefaultA':'const P2718R0::DefaultA' <NoOp>
+ // CHECK-NEXT: | | `-CXXBindTemporaryExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' (CXXTemporary {{.*}})
+ // CHECK-NEXT: | | `-CXXTemporaryObjectExpr
{{.*}} 'DefaultA':'P2718R0::DefaultA' 'void ()'
// CHECK-NEXT: | `-CXXDefaultArgExpr {{.*}} <<invalid sloc>>
'const DefaultA':'const P2718R0::DefaultA' lvalue has rewritten init
// CHECK-NEXT: | `-MaterializeTemporaryExpr {{.*}} 'const
DefaultA':'const P2718R0::DefaultA' lvalue extended by Var {{.*}} '__range1'
'int (&)[3]'
+ // CHECK-NEXT: | `-ImplicitCastExpr {{.*}} 'const
DefaultA':'const P2718R0::DefaultA' <NoOp>
+ // CHECK-NEXT: | `-CXXBindTemporaryExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' (CXXTemporary {{.*}})
+ // CHECK-NEXT: | `-CXXTemporaryObjectExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' 'void ()'
for (auto e : default_arg_fn(foo(foo(foo(A())))))
bar(e);
}
@@ -219,10 +231,19 @@ void test6() {
// CHECK-NEXT: | | | | `-CXXTemporaryObjectExpr
{{.*}} 'C':'P2718R0::C' 'void ()'
// CHECK-NEXT: | | | `-CXXDefaultArgExpr {{.*}}
<<invalid sloc>> 'const DefaultA':'const P2718R0::DefaultA' lvalue has
rewritten init
// CHECK-NEXT: | | | `-MaterializeTemporaryExpr
{{.*}} 'const DefaultA':'const P2718R0::DefaultA' lvalue extended by Var {{.*}}
'__range1' 'C &&'
+ // CHECK-NEXT: | | | `-ImplicitCastExpr {{.*}}
'const DefaultA':'const P2718R0::DefaultA' <NoOp>
+ // CHECK-NEXT: | | | `-CXXBindTemporaryExpr
{{.*}} 'DefaultA':'P2718R0::DefaultA' (CXXTemporary {{.*}})
+ // CHECK-NEXT: | | | `-CXXTemporaryObjectExpr
{{.*}} 'DefaultA':'P2718R0::DefaultA' 'void ()'
// CHECK-NEXT: | | `-CXXDefaultArgExpr {{.*}} <<invalid
sloc>> 'const DefaultA':'const P2718R0::DefaultA' lvalue has rewritten init
// CHECK-NEXT: | | `-MaterializeTemporaryExpr {{.*}}
'const DefaultA':'const P2718R0::DefaultA' lvalue extended by Var {{.*}}
'__range1' 'C &&'
+ // CHECK-NEXT: | | `-ImplicitCastExpr {{.*}} 'const
DefaultA':'const P2718R0::DefaultA' <NoOp>
+ // CHECK-NEXT: | | `-CXXBindTemporaryExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' (CXXTemporary {{.*}})
+ // CHECK-NEXT: | | `-CXXTemporaryObjectExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' 'void ()'
// CHECK-NEXT: | `-CXXDefaultArgExpr {{.*}} <<invalid sloc>>
'const DefaultA':'const P2718R0::DefaultA' lvalue has rewritten init
// CHECK-NEXT: | `-MaterializeTemporaryExpr {{.*}} 'const
DefaultA':'const P2718R0::DefaultA' lvalue extended by Var {{.*}} '__range1' 'C
&&'
+ // CHECK-NEXT: | `-ImplicitCastExpr {{.*}} 'const
DefaultA':'const P2718R0::DefaultA' <NoOp>
+ // CHECK-NEXT: | `-CXXBindTemporaryExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' (CXXTemporary {{.*}})
+ // CHECK-NEXT: | `-CXXTemporaryObjectExpr {{.*}}
'DefaultA':'P2718R0::DefaultA' 'void ()'
for (auto e : C(0, C(0, C(0, C()))))
bar(e);
}
diff --git a/clang/unittests/AST/ASTTraverserTest.cpp
b/clang/unittests/AST/ASTTraverserTest.cpp
index 362f37655a0ae4..8b6e3e90c0ea67 100644
--- a/clang/unittests/AST/ASTTraverserTest.cpp
+++ b/clang/unittests/AST/ASTTraverserTest.cpp
@@ -368,6 +368,8 @@ FunctionDecl 'stringConstruct'
| |-ImplicitCastExpr
| | `-StringLiteral
| `-CXXDefaultArgExpr
+ | `-UnaryOperator
+ | `-IntegerLiteral
`-ExprWithCleanups
`-CXXOperatorCallExpr
|-ImplicitCastExpr
@@ -378,6 +380,8 @@ FunctionDecl 'stringConstruct'
|-ImplicitCastExpr
| `-StringLiteral
`-CXXDefaultArgExpr
+ `-UnaryOperator
+ `-IntegerLiteral
)cpp");
EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
@@ -415,6 +419,8 @@ FunctionDecl 'overloadCall'
| |-ImplicitCastExpr
| | `-StringLiteral
| `-CXXDefaultArgExpr
+ | `-UnaryOperator
+ | `-IntegerLiteral
`-CXXMemberCallExpr
`-MemberExpr
`-ParenExpr
@@ -1219,6 +1225,7 @@ CXXRecordDecl 'Record'
| | `-IntegerLiteral
| |-CXXCtorInitializer 'm_i2'
| | `-CXXDefaultInitExpr
+| | `-IntegerLiteral
| |-CXXCtorInitializer 'm_s'
| | `-CXXConstructExpr
| `-CompoundStmt
@@ -1485,6 +1492,7 @@ CallExpr
| `-DeclRefExpr 'hasDefaultArg'
|-IntegerLiteral
`-CXXDefaultArgExpr
+ `-IntegerLiteral
)cpp");
EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
BN[0].getNodeAs<CallExpr>("funcCall")),
>From a4f7f4c50e20836e9906dfad273a83fd67100c13 Mon Sep 17 00:00:00 2001
From: yronglin <yronglin...@gmail.com>
Date: Wed, 10 Apr 2024 22:43:24 +0800
Subject: [PATCH 2/2] Fix test
Signed-off-by: yronglin <yronglin...@gmail.com>
---
clang/test/AST/ast-dump-default-init.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/AST/ast-dump-default-init.cpp
b/clang/test/AST/ast-dump-default-init.cpp
index a2ce4ba57aa968..e8e8b9e4f7ef29 100644
--- a/clang/test/AST/ast-dump-default-init.cpp
+++ b/clang/test/AST/ast-dump-default-init.cpp
@@ -16,7 +16,7 @@ void test() {
}
// CHECK: -CXXDefaultInitExpr 0x{{[^ ]*}} <{{.*}}> 'const A' lvalue has
rewritten init
// CHECK-NEXT: `-ExprWithCleanups 0x{{[^ ]*}} <{{.*}}> 'const A' lvalue
-// CHECK-NEXT: `-MaterializeTemporaryExpr 0x{{[^ ]*}} <{{.*}}> 'const A'
lvalue extended by Var 0x{{[^ ]*}} 'b' 'B'
+// CHECK-NEXT: `-MaterializeTemporaryExpr 0x{{[^ ]*}} <{{.*}}> 'const A'
lvalue extended by Field 0x{{[^ ]*}} 'a' 'const A &'
// CHECK-NEXT: `-ImplicitCastExpr 0x{{[^ ]*}} <{{.*}}> 'const A' <NoOp>
// CHECK-NEXT: `-CXXFunctionalCastExpr 0x{{[^ ]*}} <{{.*}}> 'A'
functional cast to A <NoOp>
// CHECK-NEXT: `-InitListExpr 0x{{[^ ]*}} <{{.*}}> 'A'
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
