This is an archive of the discontinued LLVM Phabricator instance.

Differential D81040

Split syntax tree tests into more granular ones
ClosedPublic

Authored by gribozavr on Jun 2 2020, 3:31 PM.

Details

Reviewers
hlopko
eduucaldas
Commits
rGd7d5dd31fc6f: Split syntax tree tests into more granular ones
Summary

Doing so allows us to increase test coverage by removing unnecessary
language restrictions.

Diff Detail

Event Timeline

gribozavr created this revision.Jun 2 2020, 3:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2020, 3:31 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
gribozavr2 added reviewers: hlopko, eduucaldas.Jun 2 2020, 3:31 PM
Harbormaster failed remote builds in B58828: Diff 268007!Jun 2 2020, 6:08 PM
eduucaldas accepted this revision.Jun 3 2020, 12:26 AM
This revision is now accepted and ready to land.Jun 3 2020, 12:26 AM
hlopko accepted this revision.Jun 3 2020, 12:34 AM

Thanks for working on this! :)

clang/unittests/Tooling/Syntax/TreeTest.cpp
2066

func4 -> func4a
func4a -> func4b?

gribozavr updated this revision to Diff 268100.Jun 3 2020, 2:01 AM

Refreshing this patch after pushing the patch that this one depends on.

gribozavr2 added a subscriber: gribozavr2.Jun 3 2020, 2:03 AM
gribozavr2 added inline comments.
clang/unittests/Tooling/Syntax/TreeTest.cpp
2066

Fixed, thanks.

gribozavr updated this revision to Diff 268104.Jun 3 2020, 2:16 AM

Address code review comments.

Closed by commit rGd7d5dd31fc6f: Split syntax tree tests into more granular ones (authored by gribozavr). · Explain WhyJun 3 2020, 2:43 AM
This revision was automatically updated to reflect the committed changes.
Harbormaster failed remote builds in B58875: Diff 268104!Jun 3 2020, 2:43 AM
Harbormaster failed remote builds in B58872: Diff 268100!Jun 3 2020, 3:15 AM

Revision Contents

PathSize
clang/
unittests/
Tooling/
Syntax/
468 lines

Diff 268108

clang/unittests/Tooling/Syntax/TreeTest.cpp

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Lines return Language == Lang_CXX03 || Language == Lang_CXX11 ||
Language == Lang_CXX20; Language == Lang_CXX20;
} }
bool isCXX11OrLater() const { bool isCXX11OrLater() const {
return Language == Lang_CXX11 || Language == Lang_CXX14 || return Language == Lang_CXX11 || Language == Lang_CXX14 ||
Language == Lang_CXX17 || Language == Lang_CXX20; Language == Lang_CXX17 || Language == Lang_CXX20;
} }
bool supportsCXXDynamicExceptionSpecification() const {
return Language == Lang_CXX03 || Language == Lang_CXX11 ||
Language == Lang_CXX14;
}
bool hasDelayedTemplateParsing() const { bool hasDelayedTemplateParsing() const {
return Target == "x86_64-pc-win32-msvc"; return Target == "x86_64-pc-win32-msvc";
} }
std::vector<std::string> getCommandLineArgs() const { std::vector<std::string> getCommandLineArgs() const {
std::vector<std::string> Result = getCommandLineArgsForTesting(Language); std::vector<std::string> Result = getCommandLineArgsForTesting(Language);
Result.push_back("-target"); Result.push_back("-target");
Result.push_back(Target); Result.push_back(Target);
▲ Show 20 Lines • Show All 771 Lines • ▼ Show 20 Lines `-CompoundStatement
| | `-UnknownExpression | | `-UnknownExpression
| | `-b | | `-b
| `-; | `-;
`-} `-}
)txt"); )txt");
} }
TEST_P(SyntaxTreeTest, BinaryOperator) { TEST_P(SyntaxTreeTest, BinaryOperator) {
if (!GetParam().isCXX()) {
// TODO: Split parts that depend on C++ into a separate test.
return;
}
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
void test(int a) { void test(int a) {
1 - 2; 1 - 2;
1 == 2; 1 == 2;
a = 1; a = 1;
a <<= 1; a <<= 1;
1 || 0;
true || false;
true or false;
1 & 2; 1 & 2;
1 bitand 2;
a ^= 3; a ^= 3;
a xor_eq 3;
} }
)cpp", )cpp",
R"txt( R"txt(
*: TranslationUnit *: TranslationUnit
`-SimpleDeclaration `-SimpleDeclaration
|-void |-void
|-SimpleDeclarator |-SimpleDeclarator
| |-test | |-test
Show All 36 Lines `-CompoundStatement
| | | `-a | | | `-a
| | |-<<= | | |-<<=
| | `-UnknownExpression | | `-UnknownExpression
| | `-1 | | `-1
| `-; | `-;
|-ExpressionStatement |-ExpressionStatement
| |-BinaryOperatorExpression | |-BinaryOperatorExpression
| | |-UnknownExpression | | |-UnknownExpression
| | | `-true | | | `-1
| | |-|| | | |-||
| | `-UnknownExpression | | `-UnknownExpression
| | `-false | | `-0
| `-; | `-;
|-ExpressionStatement |-ExpressionStatement
| |-BinaryOperatorExpression | |-BinaryOperatorExpression
| | |-UnknownExpression | | |-UnknownExpression
| | | `-true | | | `-1
| | |-or | | |-&
| | `-UnknownExpression | | `-UnknownExpression
| | `-false | | `-2
| `-; | `-;
|-ExpressionStatement |-ExpressionStatement
| |-BinaryOperatorExpression | |-BinaryOperatorExpression
| | |-UnknownExpression | | |-UnknownExpression
| | | `-1 | | | `-a
| | |-& | | |-^=
| | `-UnknownExpression | | `-UnknownExpression
| | `-2 | | `-3
| `-; | `-;
`-}
)txt");
}
TEST_P(SyntaxTreeTest, BinaryOperatorCxx) {
if (!GetParam().isCXX()) {
return;
}
expectTreeDumpEqual(
R"cpp(
void test(int a) {
true || false;
true or false;
1 bitand 2;
a xor_eq 3;
}
)cpp",
R"txt(
*: TranslationUnit
`-SimpleDeclaration
|-void
|-SimpleDeclarator
| |-test
| `-ParametersAndQualifiers
| |-(
| |-SimpleDeclaration
| | |-int
| | `-SimpleDeclarator
| | `-a
| `-)
`-CompoundStatement
|-{
|-ExpressionStatement |-ExpressionStatement
| |-BinaryOperatorExpression | |-BinaryOperatorExpression
| | |-UnknownExpression | | |-UnknownExpression
| | | `-1 | | | `-true
| | |-bitand | | |-||
| | `-UnknownExpression | | `-UnknownExpression
| | `-2 | | `-false
| `-; | `-;
|-ExpressionStatement |-ExpressionStatement
| |-BinaryOperatorExpression | |-BinaryOperatorExpression
| | |-UnknownExpression | | |-UnknownExpression
| | | `-a | | | `-true
| | |-^= | | |-or
| | `-UnknownExpression | | `-UnknownExpression
| | `-3 | | `-false
| `-;
|-ExpressionStatement
| |-BinaryOperatorExpression
| | |-UnknownExpression
| | | `-1
| | |-bitand
| | `-UnknownExpression
| | `-2
| `-; | `-;
|-ExpressionStatement |-ExpressionStatement
| |-BinaryOperatorExpression | |-BinaryOperatorExpression
| | |-UnknownExpression | | |-UnknownExpression
| | | `-a | | | `-a
| | |-xor_eq | | |-xor_eq
| | `-UnknownExpression | | `-UnknownExpression
| | `-3 | | `-3
▲ Show 20 Lines • Show All 1,042 Lines • ▼ Show 20 Lines`-SimpleDeclaration
| | |-static | | |-static
| | |-UnknownExpression | | |-UnknownExpression
| | | `-10 | | | `-10
| | `-] | | `-]
| `-) | `-)
`-; )txt"); `-; )txt");
} }
TEST_P(SyntaxTreeTest, ParameterListsInDeclarators) { TEST_P(SyntaxTreeTest, ParametersAndQualifiersInFreeFunctions) {
if (!GetParam().isCXX()) { if (!GetParam().isCXX()) {
// TODO: Split parts that depend on C++ into a separate test.
return; return;
} }
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
struct Test { int func1();
int a() const; int func2a(int a);
int b() volatile; int func2b(int);
int c() &; int func3a(int *ap);
int d() &&; int func3b(int *);
int foo(int a, int b); int func4a(int a, float b);
hlopkoUnsubmitted
Not Done
ReplyInline Actions

func4 -> func4a
func4a -> func4b?

hlopko: func4 -> func4a func4a -> func4b?
gribozavr2Unsubmitted
Not Done
ReplyInline Actions

Fixed, thanks.

gribozavr2: Fixed, thanks.
int foo(const int a, volatile int b, const volatile int c, int* d, int func4b(int, float);
int& e, int&& f);
};
)cpp", )cpp",
R"txt( R"txt(
*: TranslationUnit *: TranslationUnit
`-SimpleDeclaration
|-struct
|-Test
|-{
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-a | | |-func1
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | `-)
| | `-const
| `-; | `-;
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-b | | |-func2a
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | |-SimpleDeclaration
| | `-volatile | | | |-int
| | | `-SimpleDeclarator
| | | `-a
| | `-)
| `-; | `-;
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-c | | |-func2b
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | |-SimpleDeclaration
| | `-& | | | `-int
| | `-)
| `-; | `-;
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-d | | |-func3a
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | |-SimpleDeclaration
| | `-&& | | | |-int
| | | `-SimpleDeclarator
| | | |-*
| | | `-ap
| | `-)
| `-; | `-;
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-foo | | |-func3b
| | `-ParametersAndQualifiers
| | |-(
| | |-SimpleDeclaration
| | | |-int
| | | `-SimpleDeclarator
| | | `-*
| | `-)
| `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-func4a
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-SimpleDeclaration | | |-SimpleDeclaration
| | | |-int | | | |-int
| | | `-SimpleDeclarator | | | `-SimpleDeclarator
| | | `-a | | | `-a
| | |-, | | |-,
| | |-SimpleDeclaration | | |-SimpleDeclaration
| | | |-int | | | |-float
| | | `-SimpleDeclarator | | | `-SimpleDeclarator
| | | `-b | | | `-b
| | `-) | | `-)
| `-; | `-;
`-SimpleDeclaration
|-int
|-SimpleDeclarator
| |-func4b
| `-ParametersAndQualifiers
| |-(
| |-SimpleDeclaration
| | `-int
| |-,
| |-SimpleDeclaration
| | `-float
| `-)
`-;
)txt");
}
TEST_P(SyntaxTreeTest, ParametersAndQualifiersInFreeFunctionsCxx) {
if (!GetParam().isCXX()) {
return;
}
expectTreeDumpEqual(
R"cpp(
int func1(const int a, volatile int b, const volatile int c);
int func2(int& a);
)cpp",
R"txt(
*: TranslationUnit
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-foo | | |-func1
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-SimpleDeclaration | | |-SimpleDeclaration
| | | |-const | | | |-const
| | | |-int | | | |-int
| | | `-SimpleDeclarator | | | `-SimpleDeclarator
| | | `-a | | | `-a
| | |-, | | |-,
| | |-SimpleDeclaration | | |-SimpleDeclaration
| | | |-volatile | | | |-volatile
| | | |-int | | | |-int
| | | `-SimpleDeclarator | | | `-SimpleDeclarator
| | | `-b | | | `-b
| | |-, | | |-,
| | |-SimpleDeclaration | | |-SimpleDeclaration
| | | |-const | | | |-const
| | | |-volatile | | | |-volatile
| | | |-int | | | |-int
| | | `-SimpleDeclarator | | | `-SimpleDeclarator
| | | `-c | | | `-c
| | |-,
| | |-SimpleDeclaration
| | | |-int
| | | `-SimpleDeclarator
| | | |-*
| | | `-d
| | |-,
| | |-SimpleDeclaration
| | | |-int
| | | `-SimpleDeclarator
| | | |-&
| | | `-e
| | |-,
| | |-SimpleDeclaration
| | | |-int
| | | `-SimpleDeclarator
| | | |-&&
| | | `-f
| | `-) | | `-)
| `-; | `-;
|-} `-SimpleDeclaration
|-int
|-SimpleDeclarator
| |-func2
| `-ParametersAndQualifiers
| |-(
| |-SimpleDeclaration
| | |-int
| | `-SimpleDeclarator
| | |-&
| | `-a
| `-)
`-; `-;
)txt"); )txt");
} }
TEST_P(SyntaxTreeTest, TrailingConst) { TEST_P(SyntaxTreeTest, ParametersAndQualifiersInFreeFunctionsCxx11) {
if (!GetParam().isCXX11OrLater()) {
return;
}
expectTreeDumpEqual(
R"cpp(
int func1(int&& a);
)cpp",
R"txt(
*: TranslationUnit
`-SimpleDeclaration
|-int
|-SimpleDeclarator
| |-func1
| `-ParametersAndQualifiers
| |-(
| |-SimpleDeclaration
| | |-int
| | `-SimpleDeclarator
| | |-&&
| | `-a
| `-)
`-;
)txt");
}
TEST_P(SyntaxTreeTest, ParametersAndQualifiersInMemberFunctions) {
if (!GetParam().isCXX()) { if (!GetParam().isCXX()) {
// TODO: Split parts that depend on C++ into a separate test.
return; return;
} }
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
struct X { struct Test {
int foo() const; int a();
int b() const;
int c() volatile;
int d() const volatile;
int e() &;
int f() &&;
}; };
)cpp", )cpp",
R"txt( R"txt(
*: TranslationUnit *: TranslationUnit
`-SimpleDeclaration `-SimpleDeclaration
|-struct |-struct
|-X |-Test
|-{ |-{
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-foo | | |-a
| | `-ParametersAndQualifiers
| | |-(
| | `-)
| `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-b
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | |-)
| | `-const | | `-const
| `-; | `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-c
| | `-ParametersAndQualifiers
| | |-(
| | |-)
| | `-volatile
| `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-d
| | `-ParametersAndQualifiers
| | |-(
| | |-)
| | |-const
| | `-volatile
| `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-e
| | `-ParametersAndQualifiers
| | |-(
| | |-)
| | `-&
| `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-f
| | `-ParametersAndQualifiers
| | |-(
| | |-)
| | `-&&
| `-;
|-} |-}
`-; `-;
)txt"); )txt");
} }
TEST_P(SyntaxTreeTest, TrailingReturn) { TEST_P(SyntaxTreeTest, TrailingReturn) {
if (!GetParam().isCXX11OrLater()) { if (!GetParam().isCXX11OrLater()) {
return; return;
} }
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
Show All 10 Lines`-SimpleDeclaration
| |-) | |-)
| `-TrailingReturnType | `-TrailingReturnType
| |--> | |-->
| `-int | `-int
`-; `-;
)txt"); )txt");
} }
TEST_P(SyntaxTreeTest, ExceptionSpecification) { TEST_P(SyntaxTreeTest, DynamicExceptionSpecification) {
if (!GetParam().isCXX11OrLater()) { if (!GetParam().supportsCXXDynamicExceptionSpecification()) {
// TODO: Split parts that depend on C++11 into a separate test.
return; return;
} }
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
int a() noexcept; struct MyException1 {};
int b() noexcept(true); struct MyException2 {};
int c() throw(); int a() throw();
int b() throw(...);
int c() throw(MyException1);
int d() throw(MyException1, MyException2);
)cpp", )cpp",
R"txt( R"txt(
*: TranslationUnit *: TranslationUnit
|-SimpleDeclaration |-SimpleDeclaration
| |-struct
| |-MyException1
| |-{
| |-}
| `-;
|-SimpleDeclaration
| |-struct
| |-MyException2
| |-{
| |-}
| `-;
|-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-a | | |-a
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | |-)
| | `-noexcept | | |-throw
| | |-(
| | `-)
| `-; | `-;
|-SimpleDeclaration |-SimpleDeclaration
| |-int | |-int
| |-SimpleDeclarator | |-SimpleDeclarator
| | |-b | | |-b
| | `-ParametersAndQualifiers | | `-ParametersAndQualifiers
| | |-( | | |-(
| | |-) | | |-)
| | |-noexcept | | |-throw
| | |-( | | |-(
| | |-UnknownExpression | | |-...
| | | `-true | | `-)
| `-;
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-c
| | `-ParametersAndQualifiers
| | |-(
| | |-)
| | |-throw
| | |-(
| | |-MyException1
| | `-) | | `-)
| `-; | `-;
`-SimpleDeclaration `-SimpleDeclaration
|-int |-int
|-SimpleDeclarator |-SimpleDeclarator
| |-c | |-d
| `-ParametersAndQualifiers | `-ParametersAndQualifiers
| |-( | |-(
| |-) | |-)
| |-throw | |-throw
| |-( | |-(
| |-MyException1
| |-,
| |-MyException2
| `-)
`-;
)txt");
}
TEST_P(SyntaxTreeTest, NoexceptExceptionSpecification) {
if (!GetParam().isCXX11OrLater()) {
return;
}
expectTreeDumpEqual(
R"cpp(
int a() noexcept;
int b() noexcept(true);
)cpp",
R"txt(
*: TranslationUnit
|-SimpleDeclaration
| |-int
| |-SimpleDeclarator
| | |-a
| | `-ParametersAndQualifiers
| | |-(
| | |-)
| | `-noexcept
| `-;
`-SimpleDeclaration
|-int
|-SimpleDeclarator
| |-b
| `-ParametersAndQualifiers
| |-(
| |-)
| |-noexcept
| |-(
| |-UnknownExpression
| | `-true
| `-) | `-)
`-; `-;
)txt"); )txt");
} }
TEST_P(SyntaxTreeTest, DeclaratorsInParentheses) { TEST_P(SyntaxTreeTest, DeclaratorsInParentheses) {
expectTreeDumpEqual( expectTreeDumpEqual(
R"cpp( R"cpp(
▲ Show 20 Lines • Show All 344 Lines • Show Last 20 Lines