[AST][Serialization][Reflection] (De)serialize/import CXXRecordDecl::…

…Metaclass
asutton · Apr 19, 2017 · 2275d88 · 2275d88
1 parent a9940d5
commit 2275d88
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp
@@ -3087,6 +3087,13 @@ Decl *ASTNodeImporter::VisitRecordDecl(RecordDecl *D) {
   if (!D2) {
     CXXRecordDecl *D2CXX = nullptr;
     if (CXXRecordDecl *DCXX = llvm::dyn_cast<CXXRecordDecl>(D)) {
+      MetaclassDecl *FromMetaclass = DCXX->getMetaclass();
+      MetaclassDecl *ToMetaclass =
+          cast_or_null<MetaclassDecl>(Importer.Import(FromMetaclass));
+      if (!ToMetaclass && FromMetaclass)
+        return nullptr;
+      D2CXX->setMetaclass(ToMetaclass);
+
       if (DCXX->isLambda()) {
         TypeSourceInfo *TInfo = Importer.Import(DCXX->getLambdaTypeInfo());
         D2CXX = CXXRecordDecl::CreateLambda(Importer.getToContext(),

diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
@@ -1777,6 +1777,8 @@ ASTDeclReader::VisitCXXRecordDeclImpl(CXXRecordDecl *D) {
   }
   }
 
+  D->Metaclass = ReadDeclAs<MetaclassDecl>();
+
   bool WasDefinition = Record.readInt();
   if (WasDefinition)
     ReadCXXRecordDefinition(D, /*Update*/false);

diff --git a/lib/Serialization/ASTWriterDecl.cpp b/lib/Serialization/ASTWriterDecl.cpp
@@ -1247,6 +1247,8 @@ void ASTDeclWriter::VisitCXXRecordDecl(CXXRecordDecl *D) {
     Record.push_back(CXXRecNotTemplate);
   }
 
+  Record.AddDeclRef(D->getMetaclass());
+
   Record.push_back(D->isThisDeclarationADefinition());
   if (D->isThisDeclarationADefinition())
     Record.AddCXXDefinitionData(D);