Allow loading declcontext information from any file in the chain. Properly write source locations to dependent files. WIP

llvm-svn: 109119

1 files changed, 6 insertions, 1 deletions

diff --git a/clang/lib/Frontend/PCHReaderDecl.cpp b/clang/lib/Frontend/PCHReaderDecl.cpp
index d562d6f6212..7297fefcb26 100644
--- a/clang/lib/Frontend/PCHReaderDecl.cpp
+++ b/clang/lib/Frontend/PCHReaderDecl.cpp
@@ -1497,7 +1497,12 @@ Decl *PCHReader::ReadDeclRecord(unsigned Index) {
     if (Offsets.first || Offsets.second) {
       DC->setHasExternalLexicalStorage(Offsets.first != 0);
       DC->setHasExternalVisibleStorage(Offsets.second != 0);
-      DeclContextOffsets[DC] = Offsets;
+      PCHReader::DeclContextInfo Info = {
+        Loc.first,
+        Offsets.first,
+        Offsets.second
+      };
+      DeclContextOffsets[DC].push_back(Info);
     }
   }
   assert(Idx == Record.size());