commit 92dd466a1a8b71b8d315d9032d0f365b78697748
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Thu Jun 02 20:01:46 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Thu Jun 02 20:01:46 2011 +0000
tree 5a41416a270299baa876e3d89228340d5e72e16a
parent 9eebe11dd5572b1af5de487427d63614d39c2031

[PCH] Store the offsets of source location file entries and go through them
in ASTReader::validateFileEntries().

This avoids going through all source location entries and fixes the performance regression.
Many thanks to Doug for the hint!
(rdar://9530587)

llvm-svn: 132481

clang/lib/Serialization/ASTReader.cpp

diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 8b99fc7..3c3993f 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2193,6 +2193,11 @@
       F.LocalSLocSize = Record[1];
       break;
 
+    case FILE_SOURCE_LOCATION_OFFSETS:
+      F.SLocFileOffsets = (const uint32_t *)BlobStart;
+      F.LocalNumSLocFileEntries = Record[0];
+      break;
+
     case SOURCE_LOCATION_PRELOADS:
       if (PreloadSLocEntries.empty())
         PreloadSLocEntries.swap(Record);
@@ -2372,8 +2377,8 @@
     PerFileData *F = Chain[CI];
     llvm::BitstreamCursor &SLocEntryCursor = F->SLocEntryCursor;
 
-    for (unsigned i = 0, e = F->LocalNumSLocEntries; i != e; ++i) {
-      SLocEntryCursor.JumpToBit(F->SLocOffsets[i]);
+    for (unsigned i = 0, e = F->LocalNumSLocFileEntries; i != e; ++i) {
+      SLocEntryCursor.JumpToBit(F->SLocFileOffsets[i]);
       unsigned Code = SLocEntryCursor.ReadCode();
       if (Code == llvm::bitc::END_BLOCK ||
           Code == llvm::bitc::ENTER_SUBBLOCK ||
@@ -2429,10 +2434,6 @@
 
         break;
       }
-
-      case SM_SLOC_BUFFER_ENTRY:
-      case SM_SLOC_INSTANTIATION_ENTRY:
-        break;
       }
     }
   }
@@ -5197,7 +5198,8 @@
 }
 
 ASTReader::PerFileData::PerFileData(ASTFileType Ty)
-  : Type(Ty), SizeInBits(0), LocalNumSLocEntries(0), SLocOffsets(0), LocalSLocSize(0),
+  : Type(Ty), SizeInBits(0), LocalNumSLocEntries(0), SLocOffsets(0),
+    SLocFileOffsets(0), LocalSLocSize(0),
     LocalNumIdentifiers(0), IdentifierOffsets(0), IdentifierTableData(0),
     IdentifierLookupTable(0), LocalNumMacroDefinitions(0),
     MacroDefinitionOffsets(0),