[clang] 4b30b3f - [clang][ASTImporter] Fix AST import if anonymous namespaces are merged (#128735)
via cfe-commits
cfe-commits at lists.llvm.org
Tue May 6 01:17:29 PDT 2025
Author: Balázs Kéri
Date: 2025-05-06T10:17:26+02:00
New Revision: 4b30b3f901b00da1bd1f70e9ca9086e349c7cca0
URL: https://github.com/llvm/llvm-project/commit/4b30b3f901b00da1bd1f70e9ca9086e349c7cca0
DIFF: https://github.com/llvm/llvm-project/commit/4b30b3f901b00da1bd1f70e9ca9086e349c7cca0.diff
LOG: [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).
Added:
Modified:
clang/lib/AST/ASTImporter.cpp
clang/unittests/AST/ASTImporterTest.cpp
Removed:
################################################################################
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index eb0e6866e367b..b481ad5df667e 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -2628,11 +2628,12 @@ ExpectedDecl ASTNodeImporter::VisitNamespaceDecl(NamespaceDecl *D) {
if (!Name) {
// This is an anonymous namespace. Adopt an existing anonymous
// namespace if we can.
- // FIXME: Not testable.
- if (auto *TU = dyn_cast<TranslationUnitDecl>(DC))
+ DeclContext *EnclosingDC = DC->getEnclosingNamespaceContext();
+ if (auto *TU = dyn_cast<TranslationUnitDecl>(EnclosingDC))
MergeWithNamespace = TU->getAnonymousNamespace();
else
- MergeWithNamespace = cast<NamespaceDecl>(DC)->getAnonymousNamespace();
+ MergeWithNamespace =
+ cast<NamespaceDecl>(EnclosingDC)->getAnonymousNamespace();
} else {
SmallVector<NamedDecl *, 4> ConflictingDecls;
auto FoundDecls = Importer.findDeclsInToCtx(DC, Name);
diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp
index 4192faee1af80..cddd301e22e50 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<NamespaceDecl>().match(
+ FromTU, namespaceDecl(isAnonymous()));
+ auto *ToNS = FirstDeclMatcher<NamespaceDecl>().match(
+ ToTU, namespaceDecl(isAnonymous()));
+ auto *FromF = FirstDeclMatcher<FunctionDecl>().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);
More information about the cfe-commits
mailing list