diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-03-03 23:14:05 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-03-03 23:14:05 +0000 |
| commit | e7147dba733c95aec215f5576539b07f11636ff3 (patch) | |
| tree | ccfbcf33dbcc4b9ceb7797c38dbca6a5989ababc /include/llvm | |
| parent | 58f04fd22a3bbbb5b2620b6feecc36cf1b878dbd (diff) | |
| download | llvm-e7147dba733c95aec215f5576539b07f11636ff3.tar.gz llvm-e7147dba733c95aec215f5576539b07f11636ff3.tar.bz2 llvm-e7147dba733c95aec215f5576539b07f11636ff3.tar.xz | |
There are times when the landing pad won't have a call to 'eh.selector' in
it. It's been assumed up til now that it would be in its immediate
successor. However, this isn't necessarily the case. It could be in one of its
successor's successors.
Modify the code to more thoroughly check for an 'eh.selector' call in
successors. It only looks at a successor if we get there as a result of an
unconditional branch.
Testcase ObjC/exceptions-4.m in r126968.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126969 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
| -rw-r--r-- | include/llvm/CodeGen/FunctionLoweringInfo.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/llvm/CodeGen/FunctionLoweringInfo.h b/include/llvm/CodeGen/FunctionLoweringInfo.h index 7f41222d9b..4421cc02d1 100644 --- a/include/llvm/CodeGen/FunctionLoweringInfo.h +++ b/include/llvm/CodeGen/FunctionLoweringInfo.h @@ -214,8 +214,9 @@ private: void AddCatchInfo(const CallInst &I, MachineModuleInfo *MMI, MachineBasicBlock *MBB); -/// CopyCatchInfo - Copy catch information from DestBB to SrcBB. -void CopyCatchInfo(const BasicBlock *SrcBB, const BasicBlock *DestBB, +/// CopyCatchInfo - Copy catch information from SuccBB (or one of its +/// successors) to LPad. +void CopyCatchInfo(const BasicBlock *SuccBB, const BasicBlock *LPad, MachineModuleInfo *MMI, FunctionLoweringInfo &FLI); } // end namespace llvm |