Change source manager serialization to be less tied to the PCH model.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114575 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 14 insertions, 6 deletions

diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h
index 097eb76dd0..2b3dbf1569 100644
--- a/include/clang/Serialization/ASTReader.h
+++ b/include/clang/Serialization/ASTReader.h
@@ -228,8 +228,8 @@ private:
     /// AST file.
     const uint32_t *SLocOffsets;
 
-    /// \brief The next SourceLocation offset after reading this file.
-    unsigned NextOffset;
+    /// \brief The entire size of this module's source location offset range.
+    unsigned LocalSLocSize;
 
     // === Identifiers ===
 
@@ -255,6 +255,10 @@ private:
 
     // === Macros ===
 
+    /// \brief The cursor to the start of the preprocessor block, which stores
+    /// all of the macro definitions.
+    llvm::BitstreamCursor MacroCursor;
+
     /// \brief The number of macro definitions in this file.
     unsigned LocalNumMacroDefinitions;
 
@@ -264,10 +268,6 @@ private:
 
     // === Selectors ===
 
-    /// \brief The cursor to the start of the preprocessor block, which stores
-    /// all of the macro definitions.
-    llvm::BitstreamCursor MacroCursor;
-
     /// \brief The number of selectors new to this file.
     ///
     /// This is the number of entries in SelectorOffsets.
@@ -568,6 +568,9 @@ private:
   /// \brief The number of source location entries in the chain.
   unsigned TotalNumSLocEntries;
 
+  /// \brief The next offset for a SLocEntry after everything in this reader.
+  unsigned NextSLocOffset;
+
   /// \brief The number of statements (and expressions) de-serialized
   /// from the chain.
   unsigned NumStatementsRead;
@@ -788,6 +791,11 @@ public:
     return TotalNumSLocEntries;
   }
 
+  /// \brief Returns the next SLocEntry offset after the chain.
+  unsigned getNextSLocOffset() const {
+    return NextSLocOffset;
+  }
+
   /// \brief Returns the number of identifiers found in the chain.
   unsigned getTotalNumIdentifiers() const {
     return static_cast<unsigned>(IdentifiersLoaded.size());