diff options
| author | Chris Lattner <sabre@nondot.org> | 2005-04-21 16:46:46 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2005-04-21 16:46:46 +0000 |
| commit | cb2d1a2dc29f32a30a64cad048127c1077a83099 (patch) | |
| tree | 3ffd941fb3dd184873e54c0a092f4ba7d87939dd /lib/Transforms | |
| parent | 3468e57f648ae27d4c860fa47a407bb4d669bb40 (diff) | |
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!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21403 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/IPO/LowerSetJmp.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index 2ba8a756d8..38828d9dcc 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. |