From 357bbf90af65e2bee60e5f650bc2ac07f13fca74 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 21 Apr 2005 16:46:46 +0000 Subject: [PATCH] Fix a bug where we would not promote calls to invokes if they occured in the same block as the setjmp. Thanks to Greg Pettyjohn for noticing this! llvm-svn: 21403 --- lib/Transforms/IPO/LowerSetJmp.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index 2ba8a756d84..38828d9dccd 100644 --- a/lib/Transforms/IPO/LowerSetJmp.cpp +++ b/lib/Transforms/IPO/LowerSetJmp.cpp @@ -238,8 +238,7 @@ bool LowerSetJmp::doInitialization(Module& M) // "llvm.{setjmp,longjmp}" functions and none of the setjmp/longjmp error // handling functions (beginning with __llvm_sjljeh_...they don't throw // exceptions). -bool LowerSetJmp::IsTransformableFunction(const std::string& Name) -{ +bool LowerSetJmp::IsTransformableFunction(const std::string& Name) { std::string SJLJEh("__llvm_sjljeh"); if (Name.size() > SJLJEh.size()) @@ -407,7 +406,10 @@ void LowerSetJmp::TransformSetJmpCall(CallInst* Inst) BasicBlock* SetJmpContBlock = ABlock->splitBasicBlock(Inst); assert(SetJmpContBlock && "Couldn't split setjmp BB!!"); - SetJmpContBlock->setName("SetJmpContBlock"); + SetJmpContBlock->setName(ABlock->getName()+"SetJmpCont"); + + // Add the SetJmpContBlock to the set of blocks reachable from a setjmp. + DFSBlocks.insert(SetJmpContBlock); // This PHI node will be in the new block created from the // splitBasicBlock call.