diff options
| -rw-r--r-- | AST/StmtSerialization.cpp | 11 | ||||
| -rw-r--r-- | include/clang/AST/Stmt.h | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/AST/StmtSerialization.cpp b/AST/StmtSerialization.cpp index 86d52a4f68..99a14f2a30 100644 --- a/AST/StmtSerialization.cpp +++ b/AST/StmtSerialization.cpp @@ -190,17 +190,14 @@ CallExpr* CallExpr::directMaterialize(Deserializer& D) { void CaseStmt::directEmit(Serializer& S) const { S.Emit(CaseLoc); S.EmitPtr(getNextSwitchCase()); - S.BatchEmitOwnedPtrs(getLHS(),getRHS(),getSubStmt()); + S.BatchEmitOwnedPtrs((unsigned) END_EXPR,&SubExprs[0]); } CaseStmt* CaseStmt::directMaterialize(Deserializer& D) { SourceLocation CaseLoc = SourceLocation::ReadVal(D); - Expr *LHS, *RHS; - Stmt* SubStmt; - D.BatchReadOwnedPtrs(LHS,RHS,SubStmt); - - CaseStmt* stmt = new CaseStmt(LHS,RHS,SubStmt,CaseLoc); - stmt->setNextSwitchCase(D.ReadPtr<SwitchCase>()); + CaseStmt* stmt = new CaseStmt(NULL,NULL,NULL,CaseLoc); + D.ReadPtr(stmt->NextSwitchCase); + D.BatchReadOwnedPtrs((unsigned) END_EXPR,&stmt->SubExprs[0]); return stmt; } diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h index 7f927b12e1..c1eeefd507 100644 --- a/include/clang/AST/Stmt.h +++ b/include/clang/AST/Stmt.h @@ -231,10 +231,11 @@ public: // SwitchCase is the base class for CaseStmt and DefaultStmt, class SwitchCase : public Stmt { +protected: // A pointer to the following CaseStmt or DefaultStmt class, // used by SwitchStmt. SwitchCase *NextSwitchCase; -protected: + SwitchCase(StmtClass SC) : Stmt(SC), NextSwitchCase(0) {} public: |