Make the reading of the line table from a PCH file more robust against

the unlikely event that the filename IDs in the stored line table end
up being different from the filename IDs in the newly-created line
table.

llvm-svn: 68965

1 files changed, 5 insertions, 6 deletions

diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp
index 4998de371fe..9a0061ea0ee 100644
--- a/clang/lib/Frontend/PCHReader.cpp
+++ b/clang/lib/Frontend/PCHReader.cpp
@@ -200,21 +200,20 @@ static bool ParseLineTable(SourceManager &SourceMgr,
   LineTableInfo &LineTable = SourceMgr.getLineTable();
 
   // Parse the file names
-  for (unsigned I = 0, N = Record[Idx++]; I != N; ++I) {
+  std::map<int, int> FileIDs;
+  for (int I = 0, N = Record[Idx++]; I != N; ++I) {
     // Extract the file name
     unsigned FilenameLen = Record[Idx++];
     std::string Filename(&Record[Idx], &Record[Idx] + FilenameLen);
     Idx += FilenameLen;
-    unsigned ID = LineTable.getLineTableFilenameID(Filename.c_str(), 
-                                                   Filename.size());
-    if (ID != I)
-      return Error("Filename ID mismatch in PCH line table");
+    FileIDs[I] = LineTable.getLineTableFilenameID(Filename.c_str(), 
+                                                  Filename.size());
   }
 
   // Parse the line entries
   std::vector<LineEntry> Entries;
   while (Idx < Record.size()) {
-    unsigned FID = Record[Idx++];
+    int FID = FileIDs[Record[Idx++]];
 
     // Extract the line entries
     unsigned NumEntries = Record[Idx++];