[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2325d6b42f09: [SyntaxTree] Ignore implicit non-leaf
`CXXConstructExpr` (authored by eduucaldas).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,137 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test(){
+ // FIXME: 's...' is a declarator and '{...}' is initializer
+ [[S s0{}]];
+ [[S s1{1}]];
+ [[S s2{1, 2.}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s0'
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s1'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s2'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test() {
+ // FIXME: '= {...}' is initializer
+ [[S s0 = {}]];
+ [[S s1 = {1}]];
+ [[S s2 = {1, 2.}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s0'
+ |-'='
+ `-UnknownExpression
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s1'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s2'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3851,15 +3958,134 @@
R"cpp(
struct S {
S(int);
+ S(int, float);
};
-[[S s(1);]]
+// FIXME: 's...' is a declarator and '(...)' is initializer
+[[S s1(1);]]
+[[S s2(1, 2.);]]
)cpp",
{R"txt(
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
| `-UnknownExpression
-| |-'s'
+| |-'s1'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+|-SimpleDeclarator Declarator
+| `-UnknownExpression
+| |-'s2'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| |-','
+| |-FloatingLiteralExpression
+| | `-'2.' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+|
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 290331.
eduucaldas added a comment.
- Rename tests
- Add FIXMEs for init-declarators
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,137 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test(){
+ // FIXME: 's...' is a declarator and '{...}' is initializer
+ [[S s0{}]];
+ [[S s1{1}]];
+ [[S s2{1, 2.}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s0'
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s1'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s2'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test() {
+ // FIXME: '= {...}' is initializer
+ [[S s0 = {}]];
+ [[S s1 = {1}]];
+ [[S s2 = {1, 2.}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s0'
+ |-'='
+ `-UnknownExpression
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s1'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s2'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3851,15 +3958,134 @@
R"cpp(
struct S {
S(int);
+ S(int, float);
};
-[[S s(1);]]
+// FIXME: 's...' is a declarator and '(...)' is initializer
+[[S s1(1);]]
+[[S s2(1, 2.);]]
)cpp",
{R"txt(
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
| `-UnknownExpression
-| |-'s'
+| |-'s1'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+|-SimpleDeclarator Declarator
+| `-UnknownExpression
+| |-'s2'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| |-','
+| |-FloatingLiteralExpression
+| | `-'2.' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+| `-UnqualifiedId UnqualifiedId
+| `-'TakeX'
+|-'(' OpenParen
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas added inline comments.
Comment at: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp:4042
+
+TEST_P(SyntaxTreeTest, ExplicitConversion_ZeroArguments) {
+ if (!GetParam().isCXX()) {
gribozavr2 wrote:
> This is not a conversion, this is an explicit constructor call
> (CXXTemporaryObjectExpr) -- so please rename the test. Same for other tests
> below.
I am trying to follow the syntax to name things. And in the [[
https://eel.is/c++draft/expr.type.conv | grammar ]] this is under "Explicit
type conversion (functional notation)", which englobes as well things of the
type `float(3)`.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 290327.
eduucaldas marked 3 inline comments as done.
eduucaldas added a comment.
answer comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,135 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test(){
+ [[S s0{}]];
+ [[S s1{1}]];
+ [[S s2{1, 2.}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s0'
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s1'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s2'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test() {
+ [[S s0 = {}]];
+ [[S s1 = {1}]];
+ [[S s2 = {1, 2.}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s0'
+ |-'='
+ `-UnknownExpression
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s1'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s2'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3851,15 +3956,133 @@
R"cpp(
struct S {
S(int);
+ S(int, float);
};
-[[S s(1);]]
+[[S s1(1);]]
+[[S s2(1, 2.);]]
)cpp",
{R"txt(
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
| `-UnknownExpression
-| |-'s'
+| |-'s1'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+|-SimpleDeclarator Declarator
+| `-UnknownExpression
+| |-'s2'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| |-','
+| |-FloatingLiteralExpression
+| | `-'2.' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+| `-UnqualifiedId UnqualifiedId
+| `-'TakeX'
+|-'(' OpenParen
+|-CallArguments Arguments
+| `-IntegerLiteralExpression ListElement
+| `-'1' LiteralToken
+`-')' CloseParen
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest,
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
gribozavr2 accepted this revision.
gribozavr2 added inline comments.
Comment at: clang/lib/Tooling/Syntax/BuildTree.cpp:48
+// Ignores the implicit `CXXConstructExpr` for copy/move constructors generated
+// by the compiler, as well as in implicit conversions like the one wrapping
`1`
eduucaldas wrote:
> Please give feedback on this comments and should I comment the rest of the
> function?
Comment at: clang/lib/Tooling/Syntax/BuildTree.cpp:48-50
+// Ignores the implicit `CXXConstructExpr` for copy/move constructors generated
+// by the compiler, as well as in implicit conversions like the one wrapping
`1`
+// in `X x = 1;`.
gribozavr2 wrote:
> eduucaldas wrote:
> > Please give feedback on this comments and should I comment the rest of the
> > function?
>
Seems straightforward to me.
Comment at: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp:4042
+
+TEST_P(SyntaxTreeTest, ExplicitConversion_ZeroArguments) {
+ if (!GetParam().isCXX()) {
This is not a conversion, this is an explicit constructor call
(CXXTemporaryObjectExpr) -- so please rename the test. Same for other tests
below.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas added inline comments. Comment at: clang/lib/Tooling/Syntax/BuildTree.cpp:48-50 +// Ignores the implicit `CXXConstructExpr` for copy/move constructors generated +// by the compiler, as well as in implicit conversions like the one wrapping `1` +// in `X x = 1;`. Please give feedback on this comments and should I comment the rest of the function? Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D86699/new/ https://reviews.llvm.org/D86699 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 290259.
eduucaldas added a comment.
Add comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,135 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test(){
+ [[S s0{}]];
+ [[S s1{1}]];
+ [[S s2{1, 2.}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s0'
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s1'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s2'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test() {
+ [[S s0 = {}]];
+ [[S s1 = {1}]];
+ [[S s2 = {1, 2.}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s0'
+ |-'='
+ `-UnknownExpression
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s1'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s2'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3851,15 +3956,133 @@
R"cpp(
struct S {
S(int);
+ S(int, float);
};
-[[S s(1);]]
+[[S s1(1);]]
+[[S s2(1, 2.);]]
)cpp",
{R"txt(
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
| `-UnknownExpression
-| |-'s'
+| |-'s1'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+|-SimpleDeclarator Declarator
+| `-UnknownExpression
+| |-'s2'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| |-','
+| |-FloatingLiteralExpression
+| | `-'2.' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+| `-UnqualifiedId UnqualifiedId
+| `-'TakeX'
+|-'(' OpenParen
+|-CallArguments Arguments
+| `-IntegerLiteralExpression ListElement
+| `-'1' LiteralToken
+`-')' CloseParen
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Return) {
+ if (!GetParam().isCXX()) {
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 290227.
eduucaldas added a comment.
.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,135 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test(){
+ [[S s0{}]];
+ [[S s1{1}]];
+ [[S s2{1, 2.}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s0'
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s1'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s2'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test() {
+ [[S s0 = {}]];
+ [[S s1 = {1}]];
+ [[S s2 = {1, 2.}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s0'
+ |-'='
+ `-UnknownExpression
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s1'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s2'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3851,15 +3956,133 @@
R"cpp(
struct S {
S(int);
+ S(int, float);
};
-[[S s(1);]]
+[[S s1(1);]]
+[[S s2(1, 2.);]]
)cpp",
{R"txt(
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
| `-UnknownExpression
-| |-'s'
+| |-'s1'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+|-SimpleDeclarator Declarator
+| `-UnknownExpression
+| |-'s2'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| |-','
+| |-FloatingLiteralExpression
+| | `-'2.' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+| `-UnqualifiedId UnqualifiedId
+| `-'TakeX'
+|-'(' OpenParen
+|-CallArguments Arguments
+| `-IntegerLiteralExpression ListElement
+| `-'1' LiteralToken
+`-')' CloseParen
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Return) {
+ if (!GetParam().isCXX()) {
+
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 290223.
eduucaldas added a comment.
Add more tests, not extract `IgnoreImplicitConstructorSingleStep`
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,135 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test(){
+ [[S s0{}]];
+ [[S s1{1}]];
+ [[S s2{1, 2.}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s0'
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s1'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ `-UnknownExpression
+|-'s2'
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S {
+ S();
+ S(int);
+ S(int, float);
+};
+void test() {
+ [[S s0 = {}]];
+ [[S s1 = {1}]];
+ [[S s2 = {1, 2.}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s0'
+ |-'='
+ `-UnknownExpression
+|-'{'
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s1'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+`-'}'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s2'
+ |-'='
+ `-UnknownExpression
+|-'{'
+|-IntegerLiteralExpression
+| `-'1' LiteralToken
+|-','
+|-FloatingLiteralExpression
+| `-'2.' LiteralToken
+`-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3851,15 +3956,132 @@
R"cpp(
struct S {
S(int);
+ S(int, float);
};
-[[S s(1);]]
+[[S s1(1);]]
+[[S s2(1, 2.);]]
)cpp",
{R"txt(
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
| `-UnknownExpression
-| |-'s'
+| |-'s1'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+ )txt",
+ R"txt(
+SimpleDeclaration
+|-'S'
+|-SimpleDeclarator Declarator
+| `-UnknownExpression
+| |-'s2'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| |-','
+| |-FloatingLiteralExpression
+| | `-'2.' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+| `-UnqualifiedId UnqualifiedId
+| `-'TakeX'
+|-'(' OpenParen
+|-CallArguments Arguments
+| `-IntegerLiteralExpression ListElement
+| `-'1' LiteralToken
+`-')' CloseParen
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest,
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 289103.
eduucaldas marked 2 inline comments as done.
eduucaldas added a comment.
Add further tests and extract `IgnoreImplicitConstructorSingleStep`
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/include/clang/AST/IgnoreExpr.h
clang/lib/AST/Expr.cpp
clang/lib/AST/IgnoreExpr.cpp
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
@@ -3821,26 +3817,73 @@
)txt"));
}
+TEST_P(SyntaxTreeTest, InitDeclarator_Equal) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = 1]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ `-IntegerLiteralExpression
+`-'1' LiteralToken
+)txt"}));
+}
+
TEST_P(SyntaxTreeTest, InitDeclarator_Brace) {
if (!GetParam().isCXX11OrLater()) {
return;
}
- EXPECT_TRUE(treeDumpEqual(
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
R"cpp(
-int a {};
+struct S { S(int);};
+void test(){
+ [[S s{1}]];
+}
)cpp",
- R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
- |-'int'
- |-SimpleDeclarator Declarator
- | |-'a'
- | `-UnknownExpression
- | `-UnknownExpression
- | |-'{'
- | `-'}'
- `-';'
-)txt"));
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'{'
+ |-IntegerLiteralExpression
+ | `-'1' LiteralToken
+ `-'}'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, InitDeclarator_EqualBrace) {
+ if (!GetParam().isCXX11OrLater()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct S { S(int);};
+void test() {
+ [[S s = {1}]];
+}
+)cpp",
+ {R"txt(
+SimpleDeclaration
+|-'S'
+`-SimpleDeclarator Declarator
+ |-'s'
+ |-'='
+ |-'{'
+ |-IntegerLiteralExpression
+ | `-'1' LiteralToken
+ `-'}'
+)txt"}));
}
TEST_P(SyntaxTreeTest, InitDeclarator_Paren) {
@@ -3858,12 +3901,60 @@
SimpleDeclaration
|-'S'
|-SimpleDeclarator Declarator
-| `-UnknownExpression
-| |-'s'
-| |-'('
-| |-IntegerLiteralExpression
-| | `-'1' LiteralToken
-| `-')'
+| |-'s'
+| |-'('
+| |-IntegerLiteralExpression
+| | `-'1' LiteralToken
+| `-')'
+`-';'
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Argument) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+void TakeX(const X&);
+void test() {
+ [[TakeX(1)]];
+}
+)cpp",
+ {R"txt(
+CallExpression Expression
+|-IdExpression Callee
+| `-UnqualifiedId UnqualifiedId
+| `-'TakeX'
+|-'(' OpenParen
+|-CallArguments Arguments
+| `-IntegerLiteralExpression ListElement
+| `-'1' LiteralToken
+`-')' CloseParen
+)txt"}));
+}
+
+TEST_P(SyntaxTreeTest, ImplicitConversion_Return) {
+ if (!GetParam().isCXX()) {
+return;
+ }
+ EXPECT_TRUE(treeDumpEqualOnAnnotations(
+ R"cpp(
+struct X {
+ X(int);
+};
+X CreateX(){
+ [[return 1;]]
+}
+)cpp",
+ {R"txt(
+ReturnStatement Statement
+|-'return' IntroducerKeyword
+|-IntegerLiteralExpression ReturnValue
+| `-'1' LiteralToken
`-';'
)txt"}));
}
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -13,6 +13,7 @@
#include "clang/AST/DeclarationName.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
+#include "clang/AST/IgnoreExpr.h"
#include "clang/AST/RecursiveASTVisitor.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/TypeLoc.h"
@@ -44,8 +45,13 @@
using namespace clang;
+static Expr *IgnoreImplicit(Expr *E) {
+ return IgnoreExprNodes(E, IgnoreImplicitSingleStep,
+ IgnoreImplicitConstructorSingleStep);
+}
+
LLVM_ATTRIBUTE_UNUSED
-static bool isImplicitExpr(Expr *E) { return E->IgnoreImplicit() != E; }
+static bool isImplicitExpr(Expr *E) { return IgnoreImplicit(E) != E; }
namespace {
/// Get start
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
gribozavr2 accepted this revision.
gribozavr2 added inline comments.
This revision is now accepted and ready to land.
Comment at: clang/lib/Tooling/Syntax/BuildTree.cpp:48-58
+static Expr *IgnoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1
{
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
eduucaldas wrote:
> Should this go into `IgnoreExpr` as well?
>
> If yes, should we unify this with the lambda inside
> `IgnoreUnlessSpelledInSource`, thus removing the lambda and using this free
> function instead?
That sounds like a good idea to me.
Comment at: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp:1749
void test(X x, X y) {
[[x + y]];
}
Could you also add a test that invokes implicit conversions?
```
struct X {
X(int);
};
void TakeX(const X&);
void test() {
[[TakeX(1)]];
}
```
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas added a reviewer: gribozavr2.
eduucaldas added inline comments.
Comment at: clang/lib/Tooling/Syntax/BuildTree.cpp:48-58
+static Expr *IgnoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1
{
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
Should this go into `IgnoreExpr` as well?
If yes, should we unify this with the lambda inside
`IgnoreUnlessSpelledInSource`, thus removing the lambda and using this free
function instead?
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 288987.
eduucaldas added a comment.
nits
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored
already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -13,6 +13,7 @@
#include "clang/AST/DeclarationName.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
+#include "clang/AST/IgnoreExpr.h"
#include "clang/AST/RecursiveASTVisitor.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/TypeLoc.h"
@@ -44,8 +45,25 @@
using namespace clang;
+static Expr *IgnoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1
{
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
+}
+ }
+ return E;
+}
+
+static Expr *IgnoreImplicit(Expr *E) {
+ return IgnoreExprNodes(E, IgnoreImplicitSingleStep,
+ IgnoreImplicitCXXConstructExpr);
+}
+
LLVM_ATTRIBUTE_UNUSED
-static bool isImplicitExpr(Expr *E) { return E->IgnoreImplicit() != E; }
+static bool isImplicitExpr(Expr *E) { return IgnoreImplicit(E) != E; }
namespace {
/// Get start location of the Declarator from the TypeLoc.
@@ -740,7 +758,7 @@
for (auto *D : DS->decls())
Builder.noticeDeclWithoutSemicolon(D);
} else if (auto *E = dyn_cast_or_null(S)) {
- return RecursiveASTVisitor::TraverseStmt(E->IgnoreImplicit());
+ return RecursiveASTVisitor::TraverseStmt(IgnoreImplicit(E));
}
return RecursiveASTVisitor::TraverseStmt(S);
}
@@ -1579,7 +1597,7 @@
void syntax::TreeBuilder::markExprChild(Expr *Child, NodeRole Role) {
if (!Child)
return;
- Child = Child->IgnoreImplicit();
+ Child = IgnoreImplicit(Child);
syntax::Tree *ChildNode = Mapping.find(Child);
assert(ChildNode != nullptr);
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -13,6 +13,7 @@
#include "clang/AST/DeclarationName.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
+#include "clang/AST/IgnoreExpr.h"
#include "clang/AST/RecursiveASTVisitor.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/TypeLoc.h"
@@ -44,8 +45,25 @@
using namespace clang;
+static Expr *IgnoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1 {
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
+}
+ }
+ return E;
+}
+
+static Expr *IgnoreImplicit(Expr *E) {
+ return IgnoreExprNodes(E, IgnoreImplicitSingleStep,
+ IgnoreImplicitCXXConstructExpr);
+}
+
LLVM_ATTRIBUTE_UNUSED
-static bool isImplicitExpr(Expr *E) {
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas updated this revision to Diff 288984.
eduucaldas added a comment.
Use `IgnoreExpr.h` infrastructure.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86699/new/
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored
already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -13,6 +13,7 @@
#include "clang/AST/DeclarationName.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
+#include "clang/AST/IgnoreExpr.h"
#include "clang/AST/RecursiveASTVisitor.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/TypeLoc.h"
@@ -44,8 +45,25 @@
using namespace clang;
+static Expr *ignoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1
{
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
+}
+ }
+ return E;
+}
+
+static Expr *ignoreImplicit(Expr *E) {
+ return IgnoreExprNodes(E, IgnoreImplicitSingleStep,
+ ignoreImplicitCXXConstructExpr);
+}
+
LLVM_ATTRIBUTE_UNUSED
-static bool isImplicitExpr(Expr *E) { return E->IgnoreImplicit() != E; }
+static bool isImplicitExpr(Expr *E) { return ignoreImplicit(E) != E; }
namespace {
/// Get start location of the Declarator from the TypeLoc.
@@ -740,7 +758,7 @@
for (auto *D : DS->decls())
Builder.noticeDeclWithoutSemicolon(D);
} else if (auto *E = dyn_cast_or_null(S)) {
- return RecursiveASTVisitor::TraverseStmt(E->IgnoreImplicit());
+ return RecursiveASTVisitor::TraverseStmt(ignoreImplicit(E));
}
return RecursiveASTVisitor::TraverseStmt(S);
}
@@ -1579,7 +1597,7 @@
void syntax::TreeBuilder::markExprChild(Expr *Child, NodeRole Role) {
if (!Child)
return;
- Child = Child->IgnoreImplicit();
+ Child = ignoreImplicit(Child);
syntax::Tree *ChildNode = Mapping.find(Child);
assert(ChildNode != nullptr);
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -13,6 +13,7 @@
#include "clang/AST/DeclarationName.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
+#include "clang/AST/IgnoreExpr.h"
#include "clang/AST/RecursiveASTVisitor.h"
#include "clang/AST/Stmt.h"
#include "clang/AST/TypeLoc.h"
@@ -44,8 +45,25 @@
using namespace clang;
+static Expr *ignoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1 {
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
+}
+ }
+ return E;
+}
+
+static Expr *ignoreImplicit(Expr *E) {
+ return IgnoreExprNodes(E, IgnoreImplicitSingleStep,
+ ignoreImplicitCXXConstructExpr);
+}
+
LLVM_ATTRIBUTE_UNUSED
-static
[PATCH] D86699: [SyntaxTree] Ignore implicit non-leaf `CXXConstructExpr`
eduucaldas created this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
eduucaldas requested review of this revision.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D86699
Files:
clang/lib/Tooling/Syntax/BuildTree.cpp
clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
Index: clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
===
--- clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
@@ -1745,19 +1745,15 @@
struct X {
friend X operator+(X, const X&);
};
-// FIXME: Remove additional `UnknownExpression` wrapping `x`. For that, ignore
-// implicit copy constructor called on `x`. This should've been ignored already,
-// as we `IgnoreImplicit` when traversing an `Stmt`.
void test(X x, X y) {
[[x + y]];
}
)cpp",
{R"txt(
BinaryOperatorExpression Expression
-|-UnknownExpression LeftHandSide
-| `-IdExpression
-| `-UnqualifiedId UnqualifiedId
-| `-'x'
+|-IdExpression LeftHandSide
+| `-UnqualifiedId UnqualifiedId
+| `-'x'
|-'+' OperatorToken
`-IdExpression RightHandSide
`-UnqualifiedId UnqualifiedId
Index: clang/lib/Tooling/Syntax/BuildTree.cpp
===
--- clang/lib/Tooling/Syntax/BuildTree.cpp
+++ clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -44,8 +44,80 @@
using namespace clang;
+static Expr *ignoreExprNodesImpl(Expr *E) { return E; }
+template
+static Expr *ignoreExprNodesImpl(Expr *E, FnTy &, FnTys &&...Fns) {
+ return ignoreExprNodesImpl(Fn(E), std::forward(Fns)...);
+}
+
+template
+static Expr *ignoreUntilFixedPoint(Expr *E, FnTys &&...Fns) {
+ Expr *LastE = nullptr;
+ while (E != LastE) {
+LastE = E;
+E = ignoreExprNodesImpl(E, std::forward(Fns)...);
+assert(E->getSourceRange() == LastE->getSourceRange());
+ }
+ return E;
+}
+
+static Expr *ignoreImplicitCXXConstructExpr(Expr *E) {
+ if (auto *C = dyn_cast(E)) {
+auto NumArgs = C->getNumArgs();
+if (NumArgs == 1 || (NumArgs > 1 && isa(C->getArg(1 {
+ auto *A = C->getArg(0);
+ if (A->getSourceRange() == E->getSourceRange())
+return A;
+}
+ }
+ return E;
+}
+
+static Expr *ignoreImplicitCast(Expr *E) {
+ if (auto *ICE = dyn_cast(E)) {
+
+auto *UnderlyingE = ICE->getSubExpr();
+assert(UnderlyingE->getSourceRange() == E->getSourceRange());
+return UnderlyingE;
+ }
+ return E;
+}
+
+static Expr *ignoreFull(Expr *E) {
+ if (auto *FE = dyn_cast(E)) {
+auto *UnderlyingE = FE->getSubExpr();
+assert(UnderlyingE->getSourceRange() == E->getSourceRange());
+return UnderlyingE;
+ }
+ return E;
+}
+
+static Expr *ignoreMaterializeTemporary(Expr *E) {
+ if (auto *MTE = dyn_cast(E)) {
+auto *UnderlyingE = MTE->getSubExpr();
+assert(UnderlyingE->getSourceRange() == E->getSourceRange());
+return UnderlyingE;
+ }
+ return E;
+}
+
+static Expr *ignoreCXXBindTemporary(Expr *E) {
+ if (auto *BTE = dyn_cast(E)) {
+auto *UnderlyingE = BTE->getSubExpr();
+assert(UnderlyingE->getSourceRange() == E->getSourceRange());
+return UnderlyingE;
+ }
+ return E;
+}
+
+static Expr *ignoreImplicit(Expr *E) {
+ return ignoreUntilFixedPoint(E, ignoreCXXBindTemporary, ignoreImplicitCast,
+ ignoreMaterializeTemporary, ignoreFull,
+ ignoreImplicitCXXConstructExpr);
+}
+
LLVM_ATTRIBUTE_UNUSED
-static bool isImplicitExpr(Expr *E) { return E->IgnoreImplicit() != E; }
+static bool isImplicitExpr(Expr *E) { return ignoreImplicit(E) != E; }
namespace {
/// Get start location of the Declarator from the TypeLoc.
@@ -703,7 +775,7 @@
for (auto *D : DS->decls())
Builder.noticeDeclWithoutSemicolon(D);
} else if (auto *E = dyn_cast_or_null(S)) {
- return RecursiveASTVisitor::TraverseStmt(E->IgnoreImplicit());
+ return RecursiveASTVisitor::TraverseStmt(ignoreImplicit(E));
}
return RecursiveASTVisitor::TraverseStmt(S);
}
@@ -1575,7 +1647,7 @@
void syntax::TreeBuilder::markExprChild(Expr *Child, NodeRole Role) {
if (!Child)
return;
- Child = Child->IgnoreImplicit();
+ Child = ignoreImplicit(Child);
syntax::Tree *ChildNode = Mapping.find(Child);
assert(ChildNode != nullptr);
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
