[clang][ASTImporter] import InstantiatedFromMember of ClassTemplateSpecializationDecl

[jcsxky]

import of ClassTemplateSpecializationDecl didn't set InstantiatedFromMember and this makes ast-dump crash. import and set InstantiatedFromMember. fix issue

[llvmbot]

@llvm/pr-subscribers-clang

Author: Qizhi Hu (jcsxky)

Changes

import of ClassTemplateSpecializationDecl didn't set InstantiatedFromMember and this makes ast-dump crash. import and set InstantiatedFromMember. fix issue

---

Full diff: https://github.com/llvm/llvm-project/pull/76493.diff

2 Files Affected:

• (modified) clang/lib/AST/ASTImporter.cpp (+5)
• (modified) clang/unittests/AST/ASTImporterTest.cpp (+32)

diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index b61180c4f3491d..9ffae72346f2af 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -6141,6 +6141,11 @@ ExpectedDecl ASTNodeImporter::VisitClassTemplateSpecializationDecl(
                                                   InsertPos))
       // Add this partial specialization to the class template.
       ClassTemplate->AddPartialSpecialization(PartSpec2, InsertPos);
+    if (Expected<ClassTemplatePartialSpecializationDecl *> ToInstOrErr =
+            import(PartialSpec->getInstantiatedFromMember()))
+      PartSpec2->setInstantiatedFromMember(*ToInstOrErr);
+    else
+      return ToInstOrErr.takeError();
 
     updateLookupTableForTemplateParameters(*ToTPList);
   } else { // Not a partial specialization.
diff --git a/clang/unittests/AST/ASTImporterTest.cpp b/clang/unittests/AST/ASTImporterTest.cpp
index ed8ecb080e268d..1221174326b90f 100644
--- a/clang/unittests/AST/ASTImporterTest.cpp
+++ b/clang/unittests/AST/ASTImporterTest.cpp
@@ -9342,6 +9342,38 @@ TEST_P(ASTImporterOptionSpecificTestBase, ImportConflictTypeAliasTemplate) {
   EXPECT_FALSE(ImportedCallable);
 }
 
+AST_MATCHER(ClassTemplateSpecializationDecl, hasInstantiatedFromMember) {
+  if (auto Instantiate = Node.getInstantiatedFrom()) {
+    if (auto *FromPartialSpecialization =
+            Instantiate.get<ClassTemplatePartialSpecializationDecl *>()) {
+      return nullptr != FromPartialSpecialization->getInstantiatedFromMember();
+    }
+  }
+  return false;
+}
+
+TEST_P(ASTImporterOptionSpecificTestBase, ImportInstantiatedFromMember) {
+  const char *Code =
+      R"(
+      template <typename> struct B {
+        template <typename, bool = false> union D;
+        template <typename T> union D<T> {};
+        D<int> d;
+      };
+      B<int> b;
+      )";
+  Decl *FromTU = getTuDecl(Code, Lang_CXX17);
+  auto *FromA = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
+      FromTU, classTemplateSpecializationDecl(hasName("D"),
+                                              hasInstantiatedFromMember()));
+  auto *FromPartialSpecialization =
+      cast<ClassTemplatePartialSpecializationDecl *>(
+          FromA->getInstantiatedFrom());
+  auto *ImportedPartialSpecialization =
+      Import(FromPartialSpecialization, Lang_CXX17);
+  EXPECT_TRUE(ImportedPartialSpecialization->getInstantiatedFromMember());
+}
+
 INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ASTImporterLookupTableTest,
                          DefaultTestValuesForRunOptions);
 

[shafik]

LGTM but I will let @balazske approve

[shafik]

nitpick, I don't think this requires C++17 even though the original test case uses C++17.

[jcsxky]

fixed, use C++11 instead.

[balazske]

Suggested change

	auto *FromA = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
	auto *FromD = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(

[balazske]

Suggested change

	FromA->getInstantiatedFrom());
	FromD->getInstantiatedFrom());

[balazske]

ASSERT_TRUE(FromPartialSpecialization->getInstantiatedFromMember());

[jcsxky]

All has been fixed.