maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ASTImporter] Using Lang_CXX14 in ASTImporterVisibilityTest. 

Summary:
These tests may work with C++14 language constructs in the future
(variable templates and others).
To avoid warnings about language version C++ version constants in the tests
are updated.

Reviewers: martong, a.sidorin

Reviewed By: martong

Subscribers: rnkovacs, dkrupp, Szelethus, gamesh411, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D64477

llvm-svn: 366061
This commit is contained in:
Balazs Keri 2019-07-15 12:16:30 +00:00
parent 7d5100115a
commit 14d115ff98
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clang/unittests/AST/ASTImporterVisibilityTest.cpp
View File

@ -80,13 +80,13 @@ protected:
std::string Code = getCode() + getCode(); std::string Code = getCode() + getCode();
auto Pattern = getPattern(); auto Pattern = getPattern();
TranslationUnitDecl *FromTu = getTuDecl(Code, Lang_CXX, "input0.cc"); TranslationUnitDecl *FromTu = getTuDecl(Code, Lang_CXX14, "input0.cc");
auto *FromD0 = FirstDeclMatcher<DeclTy>().match(FromTu, Pattern); auto *FromD0 = FirstDeclMatcher<DeclTy>().match(FromTu, Pattern);
auto *FromD1 = LastDeclMatcher<DeclTy>().match(FromTu, Pattern); auto *FromD1 = LastDeclMatcher<DeclTy>().match(FromTu, Pattern);
auto *ToD0 = Import(FromD0, Lang_CXX); auto *ToD0 = Import(FromD0, Lang_CXX14);
auto *ToD1 = Import(FromD1, Lang_CXX); auto *ToD1 = Import(FromD1, Lang_CXX14);
EXPECT_TRUE(ToD0); EXPECT_TRUE(ToD0);
ASSERT_TRUE(ToD1); ASSERT_TRUE(ToD1);
@ -157,13 +157,14 @@ protected:
BindableMatcher<Decl> getPattern() const { return PatternFactory()(); } BindableMatcher<Decl> getPattern() const { return PatternFactory()(); }
void TypedTest_ImportAfter() { void TypedTest_ImportAfter() {
TranslationUnitDecl *ToTu = getToTuDecl(getCode0(), Lang_CXX); TranslationUnitDecl *ToTu = getToTuDecl(getCode0(), Lang_CXX14);
TranslationUnitDecl *FromTu = getTuDecl(getCode1(), Lang_CXX, "input1.cc"); TranslationUnitDecl *FromTu =
getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
auto *ToD0 = FirstDeclMatcher<DeclTy>().match(ToTu, getPattern()); auto *ToD0 = FirstDeclMatcher<DeclTy>().match(ToTu, getPattern());
auto *FromD1 = FirstDeclMatcher<DeclTy>().match(FromTu, getPattern()); auto *FromD1 = FirstDeclMatcher<DeclTy>().match(FromTu, getPattern());
auto *ToD1 = Import(FromD1, Lang_CXX); auto *ToD1 = Import(FromD1, Lang_CXX14);
ASSERT_TRUE(ToD0); ASSERT_TRUE(ToD0);
ASSERT_TRUE(ToD1); ASSERT_TRUE(ToD1);
@ -176,12 +177,14 @@ protected:
} }
void TypedTest_ImportAfterImport() { void TypedTest_ImportAfterImport() {
TranslationUnitDecl *FromTu0 = getTuDecl(getCode0(), Lang_CXX, "input0.cc"); TranslationUnitDecl *FromTu0 =
TranslationUnitDecl *FromTu1 = getTuDecl(getCode1(), Lang_CXX, "input1.cc"); getTuDecl(getCode0(), Lang_CXX14, "input0.cc");
TranslationUnitDecl *FromTu1 =
getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
auto *FromD0 = FirstDeclMatcher<DeclTy>().match(FromTu0, getPattern()); auto *FromD0 = FirstDeclMatcher<DeclTy>().match(FromTu0, getPattern());
auto *FromD1 = FirstDeclMatcher<DeclTy>().match(FromTu1, getPattern()); auto *FromD1 = FirstDeclMatcher<DeclTy>().match(FromTu1, getPattern());
auto *ToD0 = Import(FromD0, Lang_CXX); auto *ToD0 = Import(FromD0, Lang_CXX14);
auto *ToD1 = Import(FromD1, Lang_CXX); auto *ToD1 = Import(FromD1, Lang_CXX14);
ASSERT_TRUE(ToD0); ASSERT_TRUE(ToD0);
ASSERT_TRUE(ToD1); ASSERT_TRUE(ToD1);
EXPECT_NE(ToD0, ToD1); EXPECT_NE(ToD0, ToD1);
@ -192,13 +195,14 @@ protected:
} }
void TypedTest_ImportAfterWithMerge() { void TypedTest_ImportAfterWithMerge() {
TranslationUnitDecl *ToTu = getToTuDecl(getCode0(), Lang_CXX); TranslationUnitDecl *ToTu = getToTuDecl(getCode0(), Lang_CXX14);
TranslationUnitDecl *FromTu = getTuDecl(getCode1(), Lang_CXX, "input1.cc"); TranslationUnitDecl *FromTu =
getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
auto *ToF0 = FirstDeclMatcher<DeclTy>().match(ToTu, getPattern()); auto *ToF0 = FirstDeclMatcher<DeclTy>().match(ToTu, getPattern());
auto *FromF1 = FirstDeclMatcher<DeclTy>().match(FromTu, getPattern()); auto *FromF1 = FirstDeclMatcher<DeclTy>().match(FromTu, getPattern());
auto *ToF1 = Import(FromF1, Lang_CXX); auto *ToF1 = Import(FromF1, Lang_CXX14);
ASSERT_TRUE(ToF0); ASSERT_TRUE(ToF0);
ASSERT_TRUE(ToF1); ASSERT_TRUE(ToF1);
@ -213,12 +217,14 @@ protected:
} }
void TypedTest_ImportAfterImportWithMerge() { void TypedTest_ImportAfterImportWithMerge() {
TranslationUnitDecl *FromTu0 = getTuDecl(getCode0(), Lang_CXX, "input0.cc"); TranslationUnitDecl *FromTu0 =
TranslationUnitDecl *FromTu1 = getTuDecl(getCode1(), Lang_CXX, "input1.cc"); getTuDecl(getCode0(), Lang_CXX14, "input0.cc");
TranslationUnitDecl *FromTu1 =
getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
auto *FromF0 = FirstDeclMatcher<DeclTy>().match(FromTu0, getPattern()); auto *FromF0 = FirstDeclMatcher<DeclTy>().match(FromTu0, getPattern());
auto *FromF1 = FirstDeclMatcher<DeclTy>().match(FromTu1, getPattern()); auto *FromF1 = FirstDeclMatcher<DeclTy>().match(FromTu1, getPattern());
auto *ToF0 = Import(FromF0, Lang_CXX); auto *ToF0 = Import(FromF0, Lang_CXX14);
auto *ToF1 = Import(FromF1, Lang_CXX); auto *ToF1 = Import(FromF1, Lang_CXX14);
ASSERT_TRUE(ToF0); ASSERT_TRUE(ToF0);
ASSERT_TRUE(ToF1); ASSERT_TRUE(ToF1);
if (shouldBeLinked()) if (shouldBeLinked())