split stmt/expr deserialization out to PCHReaderStmt.cpp

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

1 files changed, 15 insertions, 1114 deletions

diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index a24ba124bc..52afd2db72 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -10,6 +10,7 @@
 //  This file defines the PCHReader class, which reads a precompiled header.
 //
 //===----------------------------------------------------------------------===//
+
 #include "clang/Frontend/PCHReader.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "../Sema/Sema.h" // FIXME: move Sema headers elsewhere
@@ -19,7 +20,6 @@
 #include "clang/AST/DeclGroup.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/Expr.h"
-#include "clang/AST/StmtVisitor.h"
 #include "clang/AST/Type.h"
 #include "clang/Lex/MacroInfo.h"
 #include "clang/Lex/Preprocessor.h"
@@ -415,802 +415,27 @@ PCHDeclReader::VisitDeclContext(DeclContext *DC) {
   return std::make_pair(LexicalOffset, VisibleOffset);
 }
 
-//===----------------------------------------------------------------------===//
-// Statement/expression deserialization
-//===----------------------------------------------------------------------===//
-namespace {
-  class VISIBILITY_HIDDEN PCHStmtReader 
-    : public StmtVisitor<PCHStmtReader, unsigned> {
-    PCHReader &Reader;
-    const PCHReader::RecordData &Record;
-    unsigned &Idx;
-    llvm::SmallVectorImpl<Stmt *> &StmtStack;
-
-  public:
-    PCHStmtReader(PCHReader &Reader, const PCHReader::RecordData &Record,
-                  unsigned &Idx, llvm::SmallVectorImpl<Stmt *> &StmtStack)
-      : Reader(Reader), Record(Record), Idx(Idx), StmtStack(StmtStack) { }
-
-    /// \brief The number of record fields required for the Stmt class
-    /// itself.
-    static const unsigned NumStmtFields = 0;
-
-    /// \brief The number of record fields required for the Expr class
-    /// itself.
-    static const unsigned NumExprFields = NumStmtFields + 3;
-
-    // Each of the Visit* functions reads in part of the expression
-    // from the given record and the current expression stack, then
-    // return the total number of operands that it read from the
-    // expression stack.
-
-    unsigned VisitStmt(Stmt *S);
-    unsigned VisitNullStmt(NullStmt *S);
-    unsigned VisitCompoundStmt(CompoundStmt *S);
-    unsigned VisitSwitchCase(SwitchCase *S);
-    unsigned VisitCaseStmt(CaseStmt *S);
-    unsigned VisitDefaultStmt(DefaultStmt *S);
-    unsigned VisitLabelStmt(LabelStmt *S);
-    unsigned VisitIfStmt(IfStmt *S);
-    unsigned VisitSwitchStmt(SwitchStmt *S);
-    unsigned VisitWhileStmt(WhileStmt *S);
-    unsigned VisitDoStmt(DoStmt *S);
-    unsigned VisitForStmt(ForStmt *S);
-    unsigned VisitGotoStmt(GotoStmt *S);
-    unsigned VisitIndirectGotoStmt(IndirectGotoStmt *S);
-    unsigned VisitContinueStmt(ContinueStmt *S);
-    unsigned VisitBreakStmt(BreakStmt *S);
-    unsigned VisitReturnStmt(ReturnStmt *S);
-    unsigned VisitDeclStmt(DeclStmt *S);
-    unsigned VisitAsmStmt(AsmStmt *S);
-    unsigned VisitExpr(Expr *E);
-    unsigned VisitPredefinedExpr(PredefinedExpr *E);
-    unsigned VisitDeclRefExpr(DeclRefExpr *E);
-    unsigned VisitIntegerLiteral(IntegerLiteral *E);
-    unsigned VisitFloatingLiteral(FloatingLiteral *E);
-    unsigned VisitImaginaryLiteral(ImaginaryLiteral *E);
-    unsigned VisitStringLiteral(StringLiteral *E);
-    unsigned VisitCharacterLiteral(CharacterLiteral *E);
-    unsigned VisitParenExpr(ParenExpr *E);
-    unsigned VisitUnaryOperator(UnaryOperator *E);
-    unsigned VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E);
-    unsigned VisitArraySubscriptExpr(ArraySubscriptExpr *E);
-    unsigned VisitCallExpr(CallExpr *E);
-    unsigned VisitMemberExpr(MemberExpr *E);
-    unsigned VisitCastExpr(CastExpr *E);
-    unsigned VisitBinaryOperator(BinaryOperator *E);
-    unsigned VisitCompoundAssignOperator(CompoundAssignOperator *E);
-    unsigned VisitConditionalOperator(ConditionalOperator *E);
-    unsigned VisitImplicitCastExpr(ImplicitCastExpr *E);
-    unsigned VisitExplicitCastExpr(ExplicitCastExpr *E);
-    unsigned VisitCStyleCastExpr(CStyleCastExpr *E);
-    unsigned VisitCompoundLiteralExpr(CompoundLiteralExpr *E);
-    unsigned VisitExtVectorElementExpr(ExtVectorElementExpr *E);
-    unsigned VisitInitListExpr(InitListExpr *E);
-    unsigned VisitDesignatedInitExpr(DesignatedInitExpr *E);
-    unsigned VisitImplicitValueInitExpr(ImplicitValueInitExpr *E);
-    unsigned VisitVAArgExpr(VAArgExpr *E);
-    unsigned VisitAddrLabelExpr(AddrLabelExpr *E);
-    unsigned VisitStmtExpr(StmtExpr *E);
-    unsigned VisitTypesCompatibleExpr(TypesCompatibleExpr *E);
-    unsigned VisitChooseExpr(ChooseExpr *E);
-    unsigned VisitGNUNullExpr(GNUNullExpr *E);
-    unsigned VisitShuffleVectorExpr(ShuffleVectorExpr *E);
-    unsigned VisitBlockExpr(BlockExpr *E);
-    unsigned VisitBlockDeclRefExpr(BlockDeclRefExpr *E);
-    unsigned VisitObjCStringLiteral(ObjCStringLiteral *E);
-    unsigned VisitObjCEncodeExpr(ObjCEncodeExpr *E);
-    unsigned VisitObjCSelectorExpr(ObjCSelectorExpr *E);
-    unsigned VisitObjCProtocolExpr(ObjCProtocolExpr *E);
-    unsigned VisitObjCIvarRefExpr(ObjCIvarRefExpr *E);
-    unsigned VisitObjCPropertyRefExpr(ObjCPropertyRefExpr *E);
-    unsigned VisitObjCKVCRefExpr(ObjCKVCRefExpr *E);
-    unsigned VisitObjCMessageExpr(ObjCMessageExpr *E);
-    unsigned VisitObjCSuperExpr(ObjCSuperExpr *E);
-    
-    unsigned VisitObjCForCollectionStmt(ObjCForCollectionStmt *);
-    unsigned VisitObjCAtCatchStmt(ObjCAtCatchStmt *);
-    unsigned VisitObjCAtFinallyStmt(ObjCAtFinallyStmt *);
-    unsigned VisitObjCAtTryStmt(ObjCAtTryStmt *);
-    unsigned VisitObjCAtSynchronizedStmt(ObjCAtSynchronizedStmt *);
-    unsigned VisitObjCAtThrowStmt(ObjCAtThrowStmt *);
-  };
-}
-
-unsigned PCHStmtReader::VisitStmt(Stmt *S) {
-  assert(Idx == NumStmtFields && "Incorrect statement field count");
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitNullStmt(NullStmt *S) {
-  VisitStmt(S);
-  S->setSemiLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitCompoundStmt(CompoundStmt *S) {
-  VisitStmt(S);
-  unsigned NumStmts = Record[Idx++];
-  S->setStmts(Reader.getContext(), 
-              &StmtStack[StmtStack.size() - NumStmts], NumStmts);
-  S->setLBracLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setRBracLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return NumStmts;
-}
-
-unsigned PCHStmtReader::VisitSwitchCase(SwitchCase *S) {
-  VisitStmt(S);
-  Reader.RecordSwitchCaseID(S, Record[Idx++]);
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitCaseStmt(CaseStmt *S) {
-  VisitSwitchCase(S);
-  S->setLHS(cast<Expr>(StmtStack[StmtStack.size() - 3]));
-  S->setRHS(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  S->setSubStmt(StmtStack.back());
-  S->setCaseLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 3;
-}
-
-unsigned PCHStmtReader::VisitDefaultStmt(DefaultStmt *S) {
-  VisitSwitchCase(S);
-  S->setSubStmt(StmtStack.back());
-  S->setDefaultLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitLabelStmt(LabelStmt *S) {
-  VisitStmt(S);
-  S->setID(Reader.GetIdentifierInfo(Record, Idx));
-  S->setSubStmt(StmtStack.back());
-  S->setIdentLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  Reader.RecordLabelStmt(S, Record[Idx++]);
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitIfStmt(IfStmt *S) {
-  VisitStmt(S);
-  S->setCond(cast<Expr>(StmtStack[StmtStack.size() - 3]));
-  S->setThen(StmtStack[StmtStack.size() - 2]);
-  S->setElse(StmtStack[StmtStack.size() - 1]);
-  S->setIfLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 3;
-}
-
-unsigned PCHStmtReader::VisitSwitchStmt(SwitchStmt *S) {
-  VisitStmt(S);
-  S->setCond(cast<Expr>(StmtStack[StmtStack.size() - 2]));
-  S->setBody(StmtStack.back());
-  S->setSwitchLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  SwitchCase *PrevSC = 0;
-  for (unsigned N = Record.size(); Idx != N; ++Idx) {
-    SwitchCase *SC = Reader.getSwitchCaseWithID(Record[Idx]);
-    if (PrevSC)
-      PrevSC->setNextSwitchCase(SC);
-    else
-      S->setSwitchCaseList(SC);
-    PrevSC = SC;
-  }
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitWhileStmt(WhileStmt *S) {
-  VisitStmt(S);
-  S->setCond(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  S->setBody(StmtStack.back());
-  S->setWhileLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitDoStmt(DoStmt *S) {
-  VisitStmt(S);
-  S->setCond(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  S->setBody(StmtStack.back());
-  S->setDoLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitForStmt(ForStmt *S) {
-  VisitStmt(S);
-  S->setInit(StmtStack[StmtStack.size() - 4]);
-  S->setCond(cast_or_null<Expr>(StmtStack[StmtStack.size() - 3]));
-  S->setInc(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  S->setBody(StmtStack.back());
-  S->setForLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 4;
-}
-
-unsigned PCHStmtReader::VisitGotoStmt(GotoStmt *S) {
-  VisitStmt(S);
-  Reader.SetLabelOf(S, Record[Idx++]);
-  S->setGotoLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setLabelLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitIndirectGotoStmt(IndirectGotoStmt *S) {
-  VisitStmt(S);
-  S->setGotoLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setTarget(cast_or_null<Expr>(StmtStack.back()));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitContinueStmt(ContinueStmt *S) {
-  VisitStmt(S);
-  S->setContinueLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitBreakStmt(BreakStmt *S) {
-  VisitStmt(S);
-  S->setBreakLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitReturnStmt(ReturnStmt *S) {
-  VisitStmt(S);
-  S->setRetValue(cast_or_null<Expr>(StmtStack.back()));
-  S->setReturnLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitDeclStmt(DeclStmt *S) {
-  VisitStmt(S);
-  S->setStartLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setEndLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-
-  if (Idx + 1 == Record.size()) {
-    // Single declaration
-    S->setDeclGroup(DeclGroupRef(Reader.GetDecl(Record[Idx++])));
-  } else {
-    llvm::SmallVector<Decl *, 16> Decls;
-    Decls.reserve(Record.size() - Idx);
-    for (unsigned N = Record.size(); Idx != N; ++Idx)
-      Decls.push_back(Reader.GetDecl(Record[Idx]));
-    S->setDeclGroup(DeclGroupRef(DeclGroup::Create(Reader.getContext(),
-                                                   &Decls[0], Decls.size())));
-  }
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitAsmStmt(AsmStmt *S) {
-  VisitStmt(S);
-  unsigned NumOutputs = Record[Idx++];
-  unsigned NumInputs = Record[Idx++];
-  unsigned NumClobbers = Record[Idx++];
-  S->setAsmLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setVolatile(Record[Idx++]);
-  S->setSimple(Record[Idx++]);
-  
-  unsigned StackIdx 
-    = StmtStack.size() - (NumOutputs*2 + NumInputs*2 + NumClobbers + 1);
-  S->setAsmString(cast_or_null<StringLiteral>(StmtStack[StackIdx++]));
-
-  // Outputs and inputs
-  llvm::SmallVector<std::string, 16> Names;
-  llvm::SmallVector<StringLiteral*, 16> Constraints;
-  llvm::SmallVector<Stmt*, 16> Exprs;
-  for (unsigned I = 0, N = NumOutputs + NumInputs; I != N; ++I) {
-    Names.push_back(Reader.ReadString(Record, Idx));
-    Constraints.push_back(cast_or_null<StringLiteral>(StmtStack[StackIdx++]));
-    Exprs.push_back(StmtStack[StackIdx++]);
-  }
-  S->setOutputsAndInputs(NumOutputs, NumInputs,
-                         &Names[0], &Constraints[0], &Exprs[0]);
-
-  // Constraints
-  llvm::SmallVector<StringLiteral*, 16> Clobbers;
-  for (unsigned I = 0; I != NumClobbers; ++I)
-    Clobbers.push_back(cast_or_null<StringLiteral>(StmtStack[StackIdx++]));
-  S->setClobbers(&Clobbers[0], NumClobbers);
-
-  assert(StackIdx == StmtStack.size() && "Error deserializing AsmStmt");
-  return NumOutputs*2 + NumInputs*2 + NumClobbers + 1;
-}
-
-unsigned PCHStmtReader::VisitExpr(Expr *E) {
-  VisitStmt(E);
-  E->setType(Reader.GetType(Record[Idx++]));
-  E->setTypeDependent(Record[Idx++]);
-  E->setValueDependent(Record[Idx++]);
-  assert(Idx == NumExprFields && "Incorrect expression field count");
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitPredefinedExpr(PredefinedExpr *E) {
-  VisitExpr(E);
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setIdentType((PredefinedExpr::IdentType)Record[Idx++]);
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitDeclRefExpr(DeclRefExpr *E) {
-  VisitExpr(E);
-  E->setDecl(cast<NamedDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitIntegerLiteral(IntegerLiteral *E) {
-  VisitExpr(E);
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setValue(Reader.ReadAPInt(Record, Idx));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitFloatingLiteral(FloatingLiteral *E) {
-  VisitExpr(E);
-  E->setValue(Reader.ReadAPFloat(Record, Idx));
-  E->setExact(Record[Idx++]);
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitImaginaryLiteral(ImaginaryLiteral *E) {
-  VisitExpr(E);
-  E->setSubExpr(cast<Expr>(StmtStack.back()));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitStringLiteral(StringLiteral *E) {
-  VisitExpr(E);
-  unsigned Len = Record[Idx++];
-  assert(Record[Idx] == E->getNumConcatenated() && 
-         "Wrong number of concatenated tokens!");
-  ++Idx;
-  E->setWide(Record[Idx++]);
-
-  // Read string data  
-  llvm::SmallVector<char, 16> Str(&Record[Idx], &Record[Idx] + Len);
-  E->setStrData(Reader.getContext(), &Str[0], Len);
-  Idx += Len;
-
-  // Read source locations
-  for (unsigned I = 0, N = E->getNumConcatenated(); I != N; ++I)
-    E->setStrTokenLoc(I, SourceLocation::getFromRawEncoding(Record[Idx++]));
-
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitCharacterLiteral(CharacterLiteral *E) {
-  VisitExpr(E);
-  E->setValue(Record[Idx++]);
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setWide(Record[Idx++]);
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitParenExpr(ParenExpr *E) {
-  VisitExpr(E);
-  E->setLParen(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParen(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setSubExpr(cast<Expr>(StmtStack.back()));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitUnaryOperator(UnaryOperator *E) {
-  VisitExpr(E);
-  E->setSubExpr(cast<Expr>(StmtStack.back()));
-  E->setOpcode((UnaryOperator::Opcode)Record[Idx++]);
-  E->setOperatorLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E) {
-  VisitExpr(E);
-  E->setSizeof(Record[Idx++]);
-  if (Record[Idx] == 0) {
-    E->setArgument(cast<Expr>(StmtStack.back()));
-    ++Idx;
-  } else {
-    E->setArgument(Reader.GetType(Record[Idx++]));
-  }
-  E->setOperatorLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return E->isArgumentType()? 0 : 1;
-}
-
-unsigned PCHStmtReader::VisitArraySubscriptExpr(ArraySubscriptExpr *E) {
-  VisitExpr(E);
-  E->setLHS(cast<Expr>(StmtStack[StmtStack.size() - 2]));
-  E->setRHS(cast<Expr>(StmtStack[StmtStack.size() - 1]));
-  E->setRBracketLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitCallExpr(CallExpr *E) {
-  VisitExpr(E);
-  E->setNumArgs(Reader.getContext(), Record[Idx++]);
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setCallee(cast<Expr>(StmtStack[StmtStack.size() - E->getNumArgs() - 1]));
-  for (unsigned I = 0, N = E->getNumArgs(); I != N; ++I)
-    E->setArg(I, cast<Expr>(StmtStack[StmtStack.size() - N + I]));
-  return E->getNumArgs() + 1;
-}
-
-unsigned PCHStmtReader::VisitMemberExpr(MemberExpr *E) {
-  VisitExpr(E);
-  E->setBase(cast<Expr>(StmtStack.back()));
-  E->setMemberDecl(cast<NamedDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setMemberLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setArrow(Record[Idx++]);
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitCastExpr(CastExpr *E) {
-  VisitExpr(E);
-  E->setSubExpr(cast<Expr>(StmtStack.back()));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitBinaryOperator(BinaryOperator *E) {
-  VisitExpr(E);
-  E->setLHS(cast<Expr>(StmtStack.end()[-2]));
-  E->setRHS(cast<Expr>(StmtStack.end()[-1]));
-  E->setOpcode((BinaryOperator::Opcode)Record[Idx++]);
-  E->setOperatorLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitCompoundAssignOperator(CompoundAssignOperator *E) {
-  VisitBinaryOperator(E);
-  E->setComputationLHSType(Reader.GetType(Record[Idx++]));
-  E->setComputationResultType(Reader.GetType(Record[Idx++]));
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitConditionalOperator(ConditionalOperator *E) {
-  VisitExpr(E);
-  E->setCond(cast<Expr>(StmtStack[StmtStack.size() - 3]));
-  E->setLHS(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  E->setRHS(cast_or_null<Expr>(StmtStack[StmtStack.size() - 1]));
-  return 3;
-}
-
-unsigned PCHStmtReader::VisitImplicitCastExpr(ImplicitCastExpr *E) {
-  VisitCastExpr(E);
-  E->setLvalueCast(Record[Idx++]);
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitExplicitCastExpr(ExplicitCastExpr *E) {
-  VisitCastExpr(E);
-  E->setTypeAsWritten(Reader.GetType(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitCStyleCastExpr(CStyleCastExpr *E) {
-  VisitExplicitCastExpr(E);
-  E->setLParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitCompoundLiteralExpr(CompoundLiteralExpr *E) {
-  VisitExpr(E);
-  E->setLParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setInitializer(cast<Expr>(StmtStack.back()));
-  E->setFileScope(Record[Idx++]);
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitExtVectorElementExpr(ExtVectorElementExpr *E) {
-  VisitExpr(E);
-  E->setBase(cast<Expr>(StmtStack.back()));
-  E->setAccessor(Reader.GetIdentifierInfo(Record, Idx));
-  E->setAccessorLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitInitListExpr(InitListExpr *E) {
-  VisitExpr(E);
-  unsigned NumInits = Record[Idx++];
-  E->reserveInits(NumInits);
-  for (unsigned I = 0; I != NumInits; ++I)
-    E->updateInit(I, 
-                  cast<Expr>(StmtStack[StmtStack.size() - NumInits - 1 + I]));
-  E->setSyntacticForm(cast_or_null<InitListExpr>(StmtStack.back()));
-  E->setLBraceLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRBraceLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setInitializedFieldInUnion(
-                      cast_or_null<FieldDecl>(Reader.GetDecl(Record[Idx++])));
-  E->sawArrayRangeDesignator(Record[Idx++]);
-  return NumInits + 1;
-}
-
-unsigned PCHStmtReader::VisitDesignatedInitExpr(DesignatedInitExpr *E) {
-  typedef DesignatedInitExpr::Designator Designator;
-
-  VisitExpr(E);
-  unsigned NumSubExprs = Record[Idx++];
-  assert(NumSubExprs == E->getNumSubExprs() && "Wrong number of subexprs");
-  for (unsigned I = 0; I != NumSubExprs; ++I)
-    E->setSubExpr(I, cast<Expr>(StmtStack[StmtStack.size() - NumSubExprs + I]));
-  E->setEqualOrColonLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setGNUSyntax(Record[Idx++]);
-
-  llvm::SmallVector<Designator, 4> Designators;
-  while (Idx < Record.size()) {
-    switch ((pch::DesignatorTypes)Record[Idx++]) {
-    case pch::DESIG_FIELD_DECL: {
-      FieldDecl *Field = cast<FieldDecl>(Reader.GetDecl(Record[Idx++]));
-      SourceLocation DotLoc 
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      SourceLocation FieldLoc 
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      Designators.push_back(Designator(Field->getIdentifier(), DotLoc, 
-                                       FieldLoc));
-      Designators.back().setField(Field);
-      break;
-    }
-
-    case pch::DESIG_FIELD_NAME: {
-      const IdentifierInfo *Name = Reader.GetIdentifierInfo(Record, Idx);
-      SourceLocation DotLoc 
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      SourceLocation FieldLoc 
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      Designators.push_back(Designator(Name, DotLoc, FieldLoc));
-      break;
-    }
-      
-    case pch::DESIG_ARRAY: {
-      unsigned Index = Record[Idx++];
-      SourceLocation LBracketLoc
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      SourceLocation RBracketLoc
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      Designators.push_back(Designator(Index, LBracketLoc, RBracketLoc));
-      break;
-    }
-
-    case pch::DESIG_ARRAY_RANGE: {
-      unsigned Index = Record[Idx++];
-      SourceLocation LBracketLoc
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      SourceLocation EllipsisLoc
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      SourceLocation RBracketLoc
-        = SourceLocation::getFromRawEncoding(Record[Idx++]);
-      Designators.push_back(Designator(Index, LBracketLoc, EllipsisLoc,
-                                       RBracketLoc));
-      break;
-    }
-    }
-  }
-  E->setDesignators(&Designators[0], Designators.size());
-
-  return NumSubExprs;
-}
-
-unsigned PCHStmtReader::VisitImplicitValueInitExpr(ImplicitValueInitExpr *E) {
-  VisitExpr(E);
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitVAArgExpr(VAArgExpr *E) {
-  VisitExpr(E);
-  E->setSubExpr(cast<Expr>(StmtStack.back()));
-  E->setBuiltinLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitAddrLabelExpr(AddrLabelExpr *E) {
-  VisitExpr(E);
-  E->setAmpAmpLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setLabelLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  Reader.SetLabelOf(E, Record[Idx++]);
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitStmtExpr(StmtExpr *E) {
-  VisitExpr(E);
-  E->setLParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setSubStmt(cast_or_null<CompoundStmt>(StmtStack.back()));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitTypesCompatibleExpr(TypesCompatibleExpr *E) {
-  VisitExpr(E);
-  E->setArgType1(Reader.GetType(Record[Idx++]));
-  E->setArgType2(Reader.GetType(Record[Idx++]));
-  E->setBuiltinLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitChooseExpr(ChooseExpr *E) {
-  VisitExpr(E);
-  E->setCond(cast<Expr>(StmtStack[StmtStack.size() - 3]));
-  E->setLHS(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  E->setRHS(cast_or_null<Expr>(StmtStack[StmtStack.size() - 1]));
-  E->setBuiltinLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 3;
-}
-
-unsigned PCHStmtReader::VisitGNUNullExpr(GNUNullExpr *E) {
-  VisitExpr(E);
-  E->setTokenLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitShuffleVectorExpr(ShuffleVectorExpr *E) {
-  VisitExpr(E);
-  unsigned NumExprs = Record[Idx++];
-  E->setExprs((Expr **)&StmtStack[StmtStack.size() - NumExprs], NumExprs);
-  E->setBuiltinLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return NumExprs;
-}
-
-unsigned PCHStmtReader::VisitBlockExpr(BlockExpr *E) {
-  VisitExpr(E);
-  E->setBlockDecl(cast_or_null<BlockDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setHasBlockDeclRefExprs(Record[Idx++]);
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitBlockDeclRefExpr(BlockDeclRefExpr *E) {
-  VisitExpr(E);
-  E->setDecl(cast<ValueDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setByRef(Record[Idx++]);
-  return 0;
-}
 
 //===----------------------------------------------------------------------===//
-// Objective-C Expressions and Statements
-
-unsigned PCHStmtReader::VisitObjCStringLiteral(ObjCStringLiteral *E) {
-  VisitExpr(E);
-  E->setString(cast<StringLiteral>(StmtStack.back()));
-  E->setAtLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitObjCEncodeExpr(ObjCEncodeExpr *E) {
-  VisitExpr(E);
-  E->setEncodedType(Reader.GetType(Record[Idx++]));
-  E->setAtLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitObjCSelectorExpr(ObjCSelectorExpr *E) {
-  VisitExpr(E);
-  E->setSelector(Reader.GetSelector(Record, Idx));
-  E->setAtLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitObjCProtocolExpr(ObjCProtocolExpr *E) {
-  VisitExpr(E);
-  E->setProtocol(cast<ObjCProtocolDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setAtLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitObjCIvarRefExpr(ObjCIvarRefExpr *E) {
-  VisitExpr(E);
-  E->setDecl(cast<ObjCIvarDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setBase(cast<Expr>(StmtStack.back()));
-  E->setIsArrow(Record[Idx++]);
-  E->setIsFreeIvar(Record[Idx++]);
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitObjCPropertyRefExpr(ObjCPropertyRefExpr *E) {
-  VisitExpr(E);
-  E->setProperty(cast<ObjCPropertyDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setBase(cast<Expr>(StmtStack.back()));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitObjCKVCRefExpr(ObjCKVCRefExpr *E) {
-  VisitExpr(E);
-  E->setGetterMethod(
-                 cast_or_null<ObjCMethodDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setSetterMethod(
-                 cast_or_null<ObjCMethodDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setClassProp(
-              cast_or_null<ObjCInterfaceDecl>(Reader.GetDecl(Record[Idx++])));
-  E->setBase(cast_or_null<Expr>(StmtStack.back()));
-  E->setLocation(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setClassLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
-
-unsigned PCHStmtReader::VisitObjCMessageExpr(ObjCMessageExpr *E) {
-  VisitExpr(E);
-  E->setNumArgs(Record[Idx++]);
-  E->setLeftLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setRightLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  E->setSelector(Reader.GetSelector(Record, Idx));
-  E->setMethodDecl(cast_or_null<ObjCMethodDecl>(Reader.GetDecl(Record[Idx++])));
-  
-  E->setReceiver(
-         cast_or_null<Expr>(StmtStack[StmtStack.size() - E->getNumArgs() - 1]));
-  if (!E->getReceiver()) {
-    ObjCMessageExpr::ClassInfo CI;
-    CI.first = cast_or_null<ObjCInterfaceDecl>(Reader.GetDecl(Record[Idx++]));
-    CI.second = Reader.GetIdentifierInfo(Record, Idx);
-    E->setClassInfo(CI);
-  }
-
-  for (unsigned I = 0, N = E->getNumArgs(); I != N; ++I)
-    E->setArg(I, cast<Expr>(StmtStack[StmtStack.size() - N + I]));
-  return E->getNumArgs() + 1;
-}
-
-unsigned PCHStmtReader::VisitObjCSuperExpr(ObjCSuperExpr *E) {
-  VisitExpr(E);
-  E->setLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 0;
-}
-
-unsigned PCHStmtReader::VisitObjCForCollectionStmt(ObjCForCollectionStmt *S) {
-  VisitStmt(S);
-  S->setElement(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 3]));
-  S->setCollection(cast_or_null<Expr>(StmtStack[StmtStack.size() - 2]));
-  S->setBody(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 1]));
-  S->setForLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 3;
-}
-
-unsigned PCHStmtReader::VisitObjCAtCatchStmt(ObjCAtCatchStmt *S) {
-  VisitStmt(S);
-  S->setCatchBody(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 2]));
-  S->setNextCatchStmt(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 1]));
-  S->setCatchParamDecl(cast_or_null<ParmVarDecl>(Reader.GetDecl(Record[Idx++])));
-  S->setAtCatchLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  S->setRParenLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 2;
-}
-
-unsigned PCHStmtReader::VisitObjCAtFinallyStmt(ObjCAtFinallyStmt *S) {
-  VisitStmt(S);
-  S->setFinallyBody(StmtStack.back());
-  S->setAtFinallyLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
-}
+// PCH reader implementation
+//===----------------------------------------------------------------------===//
 
-unsigned PCHStmtReader::VisitObjCAtTryStmt(ObjCAtTryStmt *S) {
-  VisitStmt(S);
-  S->setTryBody(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 3]));
-  S->setCatchStmts(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 2]));
-  S->setFinallyStmt(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 1]));
-  S->setAtTryLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 3;
-}
+PCHReader::PCHReader(Preprocessor &PP, ASTContext &Context) 
+  : SemaObj(0), PP(PP), Context(Context), Consumer(0),
+    IdentifierTableData(0), IdentifierLookupTable(0),
+    IdentifierOffsets(0),
+    MethodPoolLookupTable(0), MethodPoolLookupTableData(0),
+    TotalSelectorsInMethodPool(0), SelectorOffsets(0),
+    TotalNumSelectors(0), NumStatementsRead(0), NumMacrosRead(0),
+    NumMethodPoolSelectorsRead(0), NumMethodPoolMisses(0),
+    NumLexicalDeclContextsRead(0), NumVisibleDeclContextsRead(0) { }
 
-unsigned PCHStmtReader::VisitObjCAtSynchronizedStmt(ObjCAtSynchronizedStmt *S) {
-  VisitStmt(S);
-  S->setSynchExpr(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 2]));
-  S->setSynchBody(cast_or_null<Stmt>(StmtStack[StmtStack.size() - 1]));
-  S->setAtSynchronizedLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 2;
-}
+PCHReader::~PCHReader() {}
 
-unsigned PCHStmtReader::VisitObjCAtThrowStmt(ObjCAtThrowStmt *S) {
-  VisitStmt(S);
-  S->setThrowExpr(StmtStack.back());
-  S->setThrowLoc(SourceLocation::getFromRawEncoding(Record[Idx++]));
-  return 1;
+Expr *PCHReader::ReadExpr() {
+  return dyn_cast_or_null<Expr>(ReadStmt());
 }
 
-//===----------------------------------------------------------------------===//
-// PCH reader implementation
-//===----------------------------------------------------------------------===//
 
 namespace {
 class VISIBILITY_HIDDEN PCHMethodPoolLookupTrait {
@@ -3198,330 +2423,6 @@ Attr *PCHReader::ReadAttributes() {
   return PrevAttr;
 }
 
-Stmt *PCHReader::ReadStmt() {
-  // Within the bitstream, expressions are stored in Reverse Polish
-  // Notation, with each of the subexpressions preceding the
-  // expression they are stored in. To evaluate expressions, we
-  // continue reading expressions and placing them on the stack, with
-  // expressions having operands removing those operands from the
-  // stack. Evaluation terminates when we see a STMT_STOP record, and
-  // the single remaining expression on the stack is our result.
-  RecordData Record;
-  unsigned Idx;
-  llvm::SmallVector<Stmt *, 16> StmtStack;
-  PCHStmtReader Reader(*this, Record, Idx, StmtStack);
-  Stmt::EmptyShell Empty;
-
-  while (true) {
-    unsigned Code = Stream.ReadCode();
-    if (Code == llvm::bitc::END_BLOCK) {
-      if (Stream.ReadBlockEnd()) {
-        Error("Error at end of Source Manager block");
-        return 0;
-      }
-      break;
-    }
-
-    if (Code == llvm::bitc::ENTER_SUBBLOCK) {
-      // No known subblocks, always skip them.
-      Stream.ReadSubBlockID();
-      if (Stream.SkipBlock()) {
-        Error("Malformed block record");
-        return 0;
-      }
-      continue;
-    }
-
-    if (Code == llvm::bitc::DEFINE_ABBREV) {
-      Stream.ReadAbbrevRecord();
-      continue;
-    }
-
-    Stmt *S = 0;
-    Idx = 0;
-    Record.clear();
-    bool Finished = false;
-    switch ((pch::StmtCode)Stream.ReadRecord(Code, Record)) {
-    case pch::STMT_STOP:
-      Finished = true;
-      break;
-
-    case pch::STMT_NULL_PTR: 
-      S = 0; 
-      break;
-
-    case pch::STMT_NULL:
-      S = new (Context) NullStmt(Empty);
-      break;
-
-    case pch::STMT_COMPOUND:
-      S = new (Context) CompoundStmt(Empty);
-      break;
-
-    case pch::STMT_CASE:
-      S = new (Context) CaseStmt(Empty);
-      break;
-
-    case pch::STMT_DEFAULT:
-      S = new (Context) DefaultStmt(Empty);
-      break;
-
-    case pch::STMT_LABEL:
-      S = new (Context) LabelStmt(Empty);
-      break;
-
-    case pch::STMT_IF:
-      S = new (Context) IfStmt(Empty);
-      break;
-
-    case pch::STMT_SWITCH:
-      S = new (Context) SwitchStmt(Empty);
-      break;
-
-    case pch::STMT_WHILE:
-      S = new (Context) WhileStmt(Empty);
-      break;
-
-    case pch::STMT_DO:
-      S = new (Context) DoStmt(Empty);
-      break;
-      
-    case pch::STMT_FOR:
-      S = new (Context) ForStmt(Empty);
-      break;
-
-    case pch::STMT_GOTO:
-      S = new (Context) GotoStmt(Empty);
-      break;
-      
-    case pch::STMT_INDIRECT_GOTO:
-      S = new (Context) IndirectGotoStmt(Empty);
-      break;
-
-    case pch::STMT_CONTINUE:
-      S = new (Context) ContinueStmt(Empty);
-      break;
-
-    case pch::STMT_BREAK:
-      S = new (Context) BreakStmt(Empty);
-      break;
-
-    case pch::STMT_RETURN:
-      S = new (Context) ReturnStmt(Empty);
-      break;
-
-    case pch::STMT_DECL:
-      S = new (Context) DeclStmt(Empty);
-      break;
-
-    case pch::STMT_ASM:
-      S = new (Context) AsmStmt(Empty);
-      break;
-
-    case pch::EXPR_PREDEFINED:
-      S = new (Context) PredefinedExpr(Empty);
-      break;
-      
-    case pch::EXPR_DECL_REF: 
-      S = new (Context) DeclRefExpr(Empty); 
-      break;
-      
-    case pch::EXPR_INTEGER_LITERAL: 
-      S = new (Context) IntegerLiteral(Empty);
-      break;
-      
-    case pch::EXPR_FLOATING_LITERAL:
-      S = new (Context) FloatingLiteral(Empty);
-      break;
-      
-    case pch::EXPR_IMAGINARY_LITERAL:
-      S = new (Context) ImaginaryLiteral(Empty);
-      break;
-
-    case pch::EXPR_STRING_LITERAL:
-      S = StringLiteral::CreateEmpty(Context, 
-                                     Record[PCHStmtReader::NumExprFields + 1]);
-      break;
-
-    case pch::EXPR_CHARACTER_LITERAL:
-      S = new (Context) CharacterLiteral(Empty);
-      break;
-
-    case pch::EXPR_PAREN:
-      S = new (Context) ParenExpr(Empty);
-      break;
-
-    case pch