From 4b30b3f901b00da1bd1f70e9ca9086e349c7cca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20K=C3=A9ri?= Date: Tue, 6 May 2025 10:17:26 +0200 Subject: [clang][ASTImporter] Fix AST import if anonymous namespaces are merged (#128735) Fix of a faulty case that is shown in the second of the added tests (an anonymous namespace is imported that resides in a `extern "C"` block). --- clang/unittests/AST/ASTImporterTest.cpp | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'clang/unittests/AST/ASTImporterTest.cpp') diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp index 4192fae..cddd301e 100644 --- a/clang/unittests/AST/ASTImporterTest.cpp +++ b/clang/unittests/AST/ASTImporterTest.cpp @@ -10456,6 +10456,79 @@ TEST_P(ASTImporterOptionSpecificTestBase, EXPECT_EQ(ToFr1Imp, ToFr1); } +struct ImportAndMergeAnonymousNamespace + : public ASTImporterOptionSpecificTestBase { +protected: + void test(const char *ToCode, const char *FromCode) { + Decl *ToTU = getToTuDecl(ToCode, Lang_CXX11); + Decl *FromTU = getTuDecl(FromCode, Lang_CXX11); + auto *FromNS = FirstDeclMatcher().match( + FromTU, namespaceDecl(isAnonymous())); + auto *ToNS = FirstDeclMatcher().match( + ToTU, namespaceDecl(isAnonymous())); + auto *FromF = FirstDeclMatcher().match( + FromTU, functionDecl(hasName("f"))); + auto *ImportedF = Import(FromF, Lang_CXX11); + EXPECT_TRUE(ImportedF); + EXPECT_EQ(ImportedF->getDeclContext(), ToNS); + auto *ImportedNS = Import(FromNS, Lang_CXX11); + EXPECT_EQ(ImportedNS, ToNS); + } +}; + +TEST_P(ImportAndMergeAnonymousNamespace, NamespaceInTU) { + const char *ToCode = + R"( + namespace { + } + )"; + const char *FromCode = + R"( + namespace { + void f(); + } + )"; + test(ToCode, FromCode); +} + +TEST_P(ImportAndMergeAnonymousNamespace, NamespaceInLinkageSpec) { + const char *ToCode = + R"( + extern "C" { + namespace { + } + } + )"; + const char *FromCode = + R"( + extern "C" { + namespace { + void f(); + } + } + )"; + test(ToCode, FromCode); +} + +TEST_P(ImportAndMergeAnonymousNamespace, NamespaceInNamespace) { + const char *ToCode = + R"( + namespace X { + namespace { + } + } + )"; + const char *FromCode = + R"( + namespace X { + namespace { + void f(); + } + } + )"; + test(ToCode, FromCode); +} + INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ASTImporterLookupTableTest, DefaultTestValuesForRunOptions); @@ -10542,6 +10615,9 @@ INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportMatrixType, INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportTemplateParmDeclDefaultValue, DefaultTestValuesForRunOptions); +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportAndMergeAnonymousNamespace, + DefaultTestValuesForRunOptions); + // FIXME: Make ImportOpenCLPipe test work. // INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportOpenCLPipe, // DefaultTestValuesForRunOptions); -- cgit v1.1