2 files changed, 18 insertions, 1 deletions
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index 66a849d576..3ade493b4e 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -1711,6 +1711,8 @@ PCHReader::ReadPCHBlock(uint64_t &PreprocessorBlockOffset) {
     case pch::STATISTICS:
       TotalNumStatements = Record[0];
       TotalNumMacros = Record[1];
+      TotalLexicalDeclContexts = Record[2];
+      TotalVisibleDeclContexts = Record[3];
       break;
 
     case pch::TENTATIVE_DEFINITIONS:
@@ -2439,6 +2441,7 @@ bool PCHReader::ReadDeclsLexicallyInContext(DeclContext *DC,
   // Load all of the declaration IDs
   Decls.clear();
   Decls.insert(Decls.end(), Record.begin(), Record.end());
+  ++NumLexicalDeclContextsRead;
   return false;
 }
 
@@ -2479,6 +2482,7 @@ bool PCHReader::ReadDeclsVisibleInContext(DeclContext *DC,
       LoadedDecls.push_back(Record[Idx++]);
   }
 
+  ++NumVisibleDeclContextsRead;
   return false;
 }
 
@@ -2525,6 +2529,14 @@ void PCHReader::PrintStats() {
   std::fprintf(stderr, "  %u/%u macros read (%f%%)\n",
                NumMacrosRead, TotalNumMacros,
                ((float)NumMacrosRead/TotalNumMacros * 100));
+  std::fprintf(stderr, "  %u/%u lexical declcontexts read (%f%%)\n",
+               NumLexicalDeclContextsRead, TotalLexicalDeclContexts,
+               ((float)NumLexicalDeclContextsRead/TotalLexicalDeclContexts
+                * 100));
+  std::fprintf(stderr, "  %u/%u visible declcontexts read (%f%%)\n",
+               NumVisibleDeclContextsRead, TotalVisibleDeclContexts,
+               ((float)NumVisibleDeclContextsRead/TotalVisibleDeclContexts
+                * 100));
   std::fprintf(stderr, "\n");
 }
 
diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index 0aada62599..6557ca5c42 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -1616,6 +1616,7 @@ uint64_t PCHWriter::WriteDeclContextLexicalBlock(ASTContext &Context,
        D != DEnd; ++D)
     AddDeclRef(*D, Record);
 
+  ++NumLexicalDeclContexts;
   Stream.EmitRecord(pch::DECL_CONTEXT_LEXICAL, Record);
   return Offset;
 }
@@ -1664,6 +1665,7 @@ uint64_t PCHWriter::WriteDeclContextVisibleBlock(ASTContext &Context,
     return 0;
 
   Stream.EmitRecord(pch::DECL_CONTEXT_VISIBLE, Record);
+  ++NumVisibleDeclContexts;
   return Offset;
 }
 
@@ -1997,7 +1999,8 @@ void PCHWriter::SetIdentifierOffset(const IdentifierInfo *II, uint32_t Offset) {
 
 PCHWriter::PCHWriter(llvm::BitstreamWriter &Stream) 
   : Stream(Stream), NextTypeID(pch::NUM_PREDEF_TYPE_IDS), 
-    NumStatements(0), NumMacros(0) { }
+    NumStatements(0), NumMacros(0), NumLexicalDeclContexts(0),
+    NumVisibleDeclContexts(0) { }
 
 void PCHWriter::WritePCH(Sema &SemaRef) {
   ASTContext &Context = SemaRef.Context;
@@ -2078,6 +2081,8 @@ void PCHWriter::WritePCH(Sema &SemaRef) {
   Record.clear();
   Record.push_back(NumStatements);
   Record.push_back(NumMacros);
+  Record.push_back(NumLexicalDeclContexts);
+  Record.push_back(NumVisibleDeclContexts);
   Stream.EmitRecord(pch::STATISTICS, Record);
   Stream.ExitBlock();
 }