From 11c033e8aa6cf4cb89c7c74cff6ca6197a6d52c8 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 12 Feb 2015 23:40:45 +0000 Subject: SEH: Use the SEHTryEpilogueStack instead of a separate bool We don't need a bool to track this now that we have a stack for it. llvm-svn: 228982 --- clang/lib/CodeGen/CGException.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'clang/lib/CodeGen/CGException.cpp') diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index a76b3d82abb..61f538b0eec 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -21,7 +21,6 @@ #include "clang/AST/StmtObjC.h" #include "llvm/IR/CallSite.h" #include "llvm/IR/Intrinsics.h" -#include "llvm/Support/SaveAndRestore.h" using namespace clang; using namespace CodeGen; @@ -1708,17 +1707,15 @@ void CodeGenFunction::EmitSEHTryStmt(const SEHTryStmt &S) { EnterSEHTryStmt(S, FI); { JumpDest TryExit = getJumpDestInCurrentScope("__try.__leave"); - SEHTryEpilogueStack.push_back(&TryExit); - // Disable inlining inside SEH __try scopes. - SaveAndRestore Saver(IsSEHTryScope, true); + SEHTryEpilogueStack.push_back(&TryExit); EmitStmt(S.getTryBlock()); + SEHTryEpilogueStack.pop_back(); if (!TryExit.getBlock()->use_empty()) EmitBlock(TryExit.getBlock(), /*IsFinished=*/true); else delete TryExit.getBlock(); - SEHTryEpilogueStack.pop_back(); } ExitSEHTryStmt(S, FI); } -- cgit v1.2.3