Revert r163083 per chandlerc's request.

llvm-svn: 163149

10 files changed, 2 insertions, 69 deletions

diff --git a/clang/lib/AST/Stmt.cpp b/clang/lib/AST/Stmt.cpp
index 8d93a261791..db13f67e90f 100644
--- a/clang/lib/AST/Stmt.cpp
+++ b/clang/lib/AST/Stmt.cpp
@@ -1006,17 +1006,6 @@ SEHFinallyStmt* SEHTryStmt::getFinallyHandler() const {
   return dyn_cast<SEHFinallyStmt>(getHandler());
 }
 
-SEHLeaveStmt::SEHLeaveStmt(SourceLocation LeaveLoc)
-  : Stmt(SEHLeaveStmtClass),
-    LeaveLoc(LeaveLoc)
-{
-}
-
-SEHLeaveStmt* SEHLeaveStmt::Create(ASTContext &C,
-                                   SourceLocation LeaveLoc) {
-  return new(C) SEHLeaveStmt(LeaveLoc);
-}
-
 SEHExceptStmt::SEHExceptStmt(SourceLocation Loc,
                              Expr *FilterExpr,
                              Stmt *Block)
diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp
index ea8878ebbb1..0cf3aaf5580 100644
--- a/clang/lib/AST/StmtPrinter.cpp
+++ b/clang/lib/AST/StmtPrinter.cpp
@@ -537,11 +537,6 @@ void StmtPrinter::VisitSEHTryStmt(SEHTryStmt *Node) {
   OS << "\n";
 }
 
-void StmtPrinter::VisitSEHLeaveStmt(SEHLeaveStmt *Node) {
-  Indent() << "__leave;";
-  OS << "\n";
-}
-
 void StmtPrinter::PrintRawSEHFinallyStmt(SEHFinallyStmt *Node) {
   OS << "__finally ";
   PrintRawCompoundStmt(Node->getBlock());
@@ -551,7 +546,7 @@ void StmtPrinter::PrintRawSEHFinallyStmt(SEHFinallyStmt *Node) {
 void StmtPrinter::PrintRawSEHExceptHandler(SEHExceptStmt *Node) {
   OS << "__except (";
   VisitExpr(Node->getFilterExpr());
-  OS << ") ";
+  OS << ")\n";
   PrintRawCompoundStmt(Node->getBlock());
   OS << "\n";
 }
diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
index 1ab789e83c6..5d7f9f8edee 100644
--- a/clang/lib/AST/StmtProfile.cpp
+++ b/clang/lib/AST/StmtProfile.cpp
@@ -215,10 +215,6 @@ void StmtProfiler::VisitSEHExceptStmt(const SEHExceptStmt *S) {
   VisitStmt(S);
 }
 
-void StmtProfiler::VisitSEHLeaveStmt(const SEHLeaveStmt *S) {
-  VisitStmt(S);
-}
-
 void StmtProfiler::VisitObjCForCollectionStmt(const ObjCForCollectionStmt *S) {
   VisitStmt(S);
 }
diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp
index c535ec41a77..465fb968b7b 100644
--- a/clang/lib/CodeGen/CGStmt.cpp
+++ b/clang/lib/CodeGen/CGStmt.cpp
@@ -163,7 +163,6 @@ void CodeGenFunction::EmitStmt(const Stmt *S) {
   case Stmt::CXXForRangeStmtClass:
     EmitCXXForRangeStmt(cast<CXXForRangeStmt>(*S));
   case Stmt::SEHTryStmtClass:
-  case Stmt::SEHLeaveStmtClass:
     // FIXME Not yet implemented
     break;
   }
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index f46ccb255a7..f58f90d56c5 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -183,19 +183,6 @@ Retry:
 
     return ParseExprStatement();
   }
-  
-  case tok::kw___leave: {
-    Token LeaveTok = Tok;
-    ConsumeToken();
-    if (getCurScope()->isSEHTryScope()) {
-      Res = Actions.ActOnSEHLeaveStmt(LeaveTok.getLocation());
-    } else {
-      Diag(LeaveTok, diag::err_seh___try_block)
-         << LeaveTok.getIdentifierInfo()->getName();
-      Res = StmtError();
-    }
-    break;
-  }
 
   case tok::kw_case:                // C99 6.8.1: labeled-statement
     return ParseCaseStatement();
@@ -335,9 +322,7 @@ StmtResult Parser::ParseSEHTryBlockCommon(SourceLocation TryLoc) {
   if(Tok.isNot(tok::l_brace))
     return StmtError(Diag(Tok,diag::err_expected_lbrace));
 
-  // Use the SEHTryScope to handle __leave as a statement.
-  unsigned ScopeFlags = Scope::DeclScope | Scope::SEHTryScope;
-  StmtResult TryBlock(ParseCompoundStatement(false /*isStmtExpr*/, ScopeFlags));
+  StmtResult TryBlock(ParseCompoundStatement());
   if(TryBlock.isInvalid())
     return TryBlock;
 
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index e9866ffb3bc..76410e20aca 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -2746,12 +2746,6 @@ Sema::ActOnSEHTryBlock(bool IsCXXTry,
 }
 
 StmtResult
-Sema::ActOnSEHLeaveStmt(SourceLocation LeaveLoc)
-{
-  return Owned(SEHLeaveStmt::Create(Context, LeaveLoc));
-}
-
-StmtResult
 Sema::ActOnSEHExceptBlock(SourceLocation Loc,
                           Expr *FilterExpr,
                           Stmt *Block) {
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 10eb52a8907..19636f41438 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -1361,10 +1361,6 @@ public:
     return getSema().ActOnSEHTryBlock(IsCXXTry,TryLoc,TryBlock,Handler);
   }
 
-  StmtResult RebuildSEHLeaveStmt(SourceLocation LeaveLoc) {
-    return getSema().ActOnSEHLeaveStmt(LeaveLoc);
-  }
-
   StmtResult RebuildSEHExceptStmt(SourceLocation Loc,
                                   Expr *FilterExpr,
                                   Stmt *Block) {
@@ -6005,12 +6001,6 @@ TreeTransform<Derived>::TransformSEHTryStmt(SEHTryStmt *S) {
 
 template<typename Derived>
 StmtResult
-TreeTransform<Derived>::TransformSEHLeaveStmt(SEHLeaveStmt *S) {
-  return getDerived().RebuildSEHLeaveStmt(S->getLeaveLoc());
-}
-
-template<typename Derived>
-StmtResult
 TreeTransform<Derived>::TransformSEHFinallyStmt(SEHFinallyStmt *S) {
   StmtResult Block; //  = getDerived().TransformCompoundStatement(S->getBlock());
   if(Block.isInvalid()) return StmtError();
diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp
index 3252c7db587..6ca450b9fb4 100644
--- a/clang/lib/Serialization/ASTReaderStmt.cpp
+++ b/clang/lib/Serialization/ASTReaderStmt.cpp
@@ -1516,11 +1516,6 @@ void ASTStmtReader::VisitSEHTryStmt(SEHTryStmt *S) {
   S->Children[SEHTryStmt::HANDLER] = Reader.ReadSubStmt();
 }
 
-void ASTStmtReader::VisitSEHLeaveStmt(SEHLeaveStmt *S) {
-  VisitStmt(S);
-  S->LeaveLoc = ReadSourceLocation(Record, Idx);
-}
-
 //===----------------------------------------------------------------------===//
 // CUDA Expressions and Statements
 //===----------------------------------------------------------------------===//
@@ -1991,9 +1986,6 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) {
     case STMT_SEH_TRY:
       S = new (Context) SEHTryStmt(Empty);
       break;
-    case STMT_SEH_LEAVE:
-      S = new (Context) SEHLeaveStmt(Empty);
-      break;
     case STMT_CXX_CATCH:
       S = new (Context) CXXCatchStmt(Empty);
       break;
diff --git a/clang/lib/Serialization/ASTWriterStmt.cpp b/clang/lib/Serialization/ASTWriterStmt.cpp
index 9d626d1b59a..5fa08d256cd 100644
--- a/clang/lib/Serialization/ASTWriterStmt.cpp
+++ b/clang/lib/Serialization/ASTWriterStmt.cpp
@@ -1554,12 +1554,6 @@ void ASTStmtWriter::VisitSEHTryStmt(SEHTryStmt *S) {
   Code = serialization::STMT_SEH_TRY;
 }
 
-void ASTStmtWriter::VisitSEHLeaveStmt(SEHLeaveStmt *S) {
-  VisitStmt(S);
-  Writer.AddSourceLocation(S->getLeaveLoc(), Record);
-  Code = serialization::STMT_SEH_LEAVE;
-}
-
 //===----------------------------------------------------------------------===//
 // ASTWriter Implementation
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
index 5c4492a48c2..4225c67dc70 100644
--- a/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
+++ b/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
@@ -527,7 +527,6 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred,
     case Stmt::PackExpansionExprClass:
     case Stmt::SubstNonTypeTemplateParmPackExprClass:
     case Stmt::SEHTryStmtClass:
-    case Stmt::SEHLeaveStmtClass:
     case Stmt::SEHExceptStmtClass:
     case Stmt::LambdaExprClass:
     case Stmt::SEHFinallyStmtClass: {