commit dab33c5d33b3d9febfe8a68bfdfbd56df8f95e42
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jul 02 11:55:20 2010 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jul 02 11:55:20 2010 +0000
tree a8974a4850241c60099acf78dbb7f7726a463219
parent ee776bcb7a3d6eaafc6d84c7c6c307329e2e77c8

Allow reading of InjectedClassNameType from PCH even when its decl is currently initializing.

llvm-svn: 107473

clang/lib/Frontend/PCHReader.cpp

diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp
index ecd9505..5941ec0 100644
--- a/clang/lib/Frontend/PCHReader.cpp
+++ b/clang/lib/Frontend/PCHReader.cpp
@@ -2197,7 +2197,10 @@
   case pch::TYPE_INJECTED_CLASS_NAME: {
     CXXRecordDecl *D = cast<CXXRecordDecl>(GetDecl(Record[0]));
     QualType TST = GetType(Record[1]); // probably derivable
-    return Context->getInjectedClassNameType(D, TST);
+    // FIXME: ASTContext::getInjectedClassNameType is not currently suitable
+    // for PCH reading, too much interdependencies.
+    return
+      QualType(new (*Context, TypeAlignment) InjectedClassNameType(D, TST), 0);
   }
   
   case pch::TYPE_TEMPLATE_TYPE_PARM: {