When reading in the DeclCtx during deserialization, register the DeclCtx of the

ScopedDecl with the backpatcher, and *not* a local variable on the stack. The
value of DeclCtx gets filled in *later* by the backpatcher.

This fixes: http://llvm.org/bugs/show_bug.cgi?id=2308

llvm-svn: 50976

1 files changed, 4 insertions, 3 deletions

diff --git a/clang/lib/AST/DeclSerialization.cpp b/clang/lib/AST/DeclSerialization.cpp
index cbae8313082..291649b0d06 100644
--- a/clang/lib/AST/DeclSerialization.cpp
+++ b/clang/lib/AST/DeclSerialization.cpp
@@ -116,9 +116,10 @@ void ScopedDecl::EmitInRec(Serializer& S) const {
 void ScopedDecl::ReadInRec(Deserializer& D, ASTContext& C) {
   NamedDecl::ReadInRec(D, C);
   D.ReadPtr(Next);                                  // From ScopedDecl.
-  Decl *TmpD;
-  D.ReadPtr(TmpD);                                  // From ScopedDecl.
-  DeclCtx = cast_or_null<DeclContext>(TmpD);
+  
+  DeclCtx = 0;            // Allow back-patching.  Observe that we register
+  D.ReadPtr(DeclCtx);     // the variable of the *object* for back-patching.
+                          // It's actual value will get filled in later.
 }
     
   //===------------------------------------------------------------===//