2 files changed, 19 insertions, 2 deletions
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index da7b4229aa..5ea1f7c6c2 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -1173,7 +1173,7 @@ PCHReader::PCHReadResult PCHReader::ReadPCHBlock() {
   }
 
   uint64_t PreprocessorBlockBit = 0;
-  
+
   // Read all of the records and blocks for the PCH file.
   RecordData Record;
   while (!Stream.AtEndOfStream()) {
@@ -1315,6 +1315,11 @@ PCHReader::PCHReadResult PCHReader::ReadPCHBlock() {
       }
       ExternalDefinitions.swap(Record);
       break;
+
+    case pch::STATISTICS:
+      TotalNumStatements = Record[0];
+      break;
+
     }
   }
 
@@ -1976,6 +1981,9 @@ void PCHReader::PrintStats() {
   std::fprintf(stderr, "  %u/%u identifiers read (%f%%)\n",
                NumIdentifiersLoaded, (unsigned)IdentifierData.size(),
                ((float)NumIdentifiersLoaded/IdentifierData.size() * 100));
+  std::fprintf(stderr, "  %u/%u statements read (%f%%)\n",
+               NumStatementsRead, TotalNumStatements,
+               ((float)NumStatementsRead/TotalNumStatements * 100));
   std::fprintf(stderr, "\n");
 }
 
@@ -2450,6 +2458,8 @@ Stmt *PCHReader::ReadStmt() {
     if (Finished)
       break;
 
+    ++NumStatementsRead;
+
     if (S) {
       unsigned NumSubStmts = Reader.Visit(S);
       while (NumSubStmts > 0) {
diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index 5775ac4c13..64bf3833b4 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -1723,7 +1723,7 @@ void PCHWriter::AddString(const std::string &Str, RecordData &Record) {
 }
 
 PCHWriter::PCHWriter(llvm::BitstreamWriter &Stream) 
-  : Stream(Stream), NextTypeID(pch::NUM_PREDEF_TYPE_IDS) { }
+  : Stream(Stream), NextTypeID(pch::NUM_PREDEF_TYPE_IDS), NumStatements(0) { }
 
 void PCHWriter::WritePCH(ASTContext &Context, const Preprocessor &PP) {
   // Emit the file header.
@@ -1749,6 +1749,11 @@ void PCHWriter::WritePCH(ASTContext &Context, const Preprocessor &PP) {
   Stream.EmitRecord(pch::DECL_OFFSET, DeclOffsets);
   if (!ExternalDefinitions.empty())
     Stream.EmitRecord(pch::EXTERNAL_DEFINITIONS, ExternalDefinitions);
+  
+  // Some simple statistics
+  RecordData Record;
+  Record.push_back(NumStatements);
+  Stream.EmitRecord(pch::STATISTICS, Record);
   Stream.ExitBlock();
 }
 
@@ -1880,6 +1885,7 @@ void PCHWriter::AddDeclarationName(DeclarationName Name, RecordData &Record) {
 void PCHWriter::WriteSubStmt(Stmt *S) {
   RecordData Record;
   PCHStmtWriter Writer(*this, Record);
+  ++NumStatements;
 
   if (!S) {
     Stream.EmitRecord(pch::STMT_NULL_PTR, Record);
@@ -1900,6 +1906,7 @@ void PCHWriter::FlushStmts() {
   PCHStmtWriter Writer(*this, Record);
 
   for (unsigned I = 0, N = StmtsToEmit.size(); I != N; ++I) {
+    ++NumStatements;
     Stmt *S = StmtsToEmit[I];
 
     if (!S) {