From 1c130bb04be91042cdbaf3361c4c55bbc5313093 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 16 Apr 2015 17:02:23 +0000 Subject: [WinEH] Handle a landingpad, resume, and cleanup all rolled into a BB This happens a lot with simple cleanups after SimplifyCFG. llvm-svn: 235117 --- llvm/lib/CodeGen/WinEHPrepare.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'llvm/lib/CodeGen/WinEHPrepare.cpp') diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp index 4b0ce21111b..35b944ea309 100644 --- a/llvm/lib/CodeGen/WinEHPrepare.cpp +++ b/llvm/lib/CodeGen/WinEHPrepare.cpp @@ -1582,11 +1582,10 @@ void WinEHPrepare::findCleanupHandlers(LandingPadActions &Actions, InsertValueInst *Insert1 = nullptr; InsertValueInst *Insert2 = nullptr; Value *ResumeVal = Resume->getOperand(0); - // If there is only one landingpad, we may use the lpad directly with no - // insertions. - if (isa(ResumeVal)) - return; - if (!isa(ResumeVal)) { + // If the resume value isn't a phi or landingpad value, it should be a + // series of insertions. Identify them so we can avoid them when scanning + // for cleanups. + if (!isa(ResumeVal) && !isa(ResumeVal)) { Insert2 = dyn_cast(ResumeVal); if (!Insert2) return createCleanupHandler(Actions, CleanupHandlerMap, BB); @@ -1702,7 +1701,6 @@ void WinEHPrepare::findCleanupHandlers(LandingPadActions &Actions, return; BB = Branch->getSuccessor(0); } - return; } // This is a public function, declared in WinEHFuncInfo.h and is also -- cgit v1.2.3