Include a hack to allow loading of templated CXXRecordDecls and test template reading from PCH.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@106393 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Frontend/PCHWriterDecl.cpp
index 0671710..a704d67 100644
--- a/lib/Frontend/PCHWriterDecl.cpp
+++ b/lib/Frontend/PCHWriterDecl.cpp
@@ -136,7 +136,14 @@
void PCHDeclWriter::VisitTypeDecl(TypeDecl *D) {
VisitNamedDecl(D);
- Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);
+ if (isa<CXXRecordDecl>(D)) {
+ // FIXME: Hack. To read a templated CXXRecordDecl from PCH, we need an
+ // initialized CXXRecordDecl before creating an InjectedClassNameType.
+ // Delay emitting/reading CXXRecordDecl's TypeForDecl until when we handle
+ // CXXRecordDecl emitting/initialization.
+ Writer.AddTypeRef(QualType(), Record);
+ } else
+ Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);
}
void PCHDeclWriter::VisitTypedefDecl(TypedefDecl *D) {
@@ -591,6 +598,9 @@
Record.push_back(CXXRecNotTemplate);
}
+ // FIXME: Hack. See PCHDeclWriter::VisitTypeDecl.
+ Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);
+
if (D->isDefinition()) {
unsigned NumBases = D->getNumBases();
Record.push_back(NumBases);