diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-08-25 05:55:40 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-08-25 05:55:40 +0000 |
| commit | 8b6af8a2a9a36bc9324c60d80cea021abf4d42d8 (patch) | |
| tree | e46740dba6f1b23db1b61f8326d0c2b6c37e1b25 | |
| parent | 2df9f8df9541e7650876413cde555eb3d285be4b (diff) | |
| download | external_llvm-8b6af8a2a9a36bc9324c60d80cea021abf4d42d8.zip external_llvm-8b6af8a2a9a36bc9324c60d80cea021abf4d42d8.tar.gz external_llvm-8b6af8a2a9a36bc9324c60d80cea021abf4d42d8.tar.bz2 | |
LSR wants to split the landing pad's critical edge. Let it do it, but use the
proper function to do it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138550 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Scalar/LoopStrengthReduce.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGen/Generic/exception-handling.ll | 29 |
2 files changed, 37 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp index 2d93cac..3938ab6 100644 --- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -3625,7 +3625,14 @@ void LSRInstance::RewriteForPHI(PHINode *PN, Loop *PNLoop = LI.getLoopFor(Parent); if (!PNLoop || Parent != PNLoop->getHeader()) { // Split the critical edge. - BasicBlock *NewBB = SplitCriticalEdge(BB, Parent, P); + BasicBlock *NewBB = 0; + if (!Parent->isLandingPad()) { + NewBB = SplitCriticalEdge(BB, Parent, P); + } else { + SmallVector<BasicBlock*, 2> NewBBs; + SplitLandingPadPredecessors(Parent, BB, "", "", P, NewBBs); + NewBB = NewBBs[0]; + } // If PN is outside of the loop and BB is in the loop, we want to // move the block to be immediately before the PHI block, not diff --git a/test/CodeGen/Generic/exception-handling.ll b/test/CodeGen/Generic/exception-handling.ll new file mode 100644 index 0000000..376e1f1 --- /dev/null +++ b/test/CodeGen/Generic/exception-handling.ll @@ -0,0 +1,29 @@ +; RUN: llc < %s +; PR10733 +declare void @_Znam() + +define void @_ZNK14gIndexOdometer15AfterExcisionOfERi() uwtable align 2 { +_ZN6Gambit5ArrayIiEC2Ej.exit36: + br label %"9" + +"9": ; preds = %"10", %_ZN6Gambit5ArrayIiEC2Ej.exit36 + %indvar82 = phi i64 [ 0, %_ZN6Gambit5ArrayIiEC2Ej.exit36 ], [ %tmp85, %"10" ] + %tmp85 = add i64 %indvar82, 1 + %tmp = trunc i64 %tmp85 to i32 + invoke void @_ZNK14gIndexOdometer9NoIndicesEv() + to label %"10" unwind label %lpad27 + +"10": ; preds = %"9" + invoke void @_Znam() + to label %"9" unwind label %lpad27 + +lpad27: ; preds = %"10", %"9" + %0 = phi i32 [ undef, %"9" ], [ %tmp, %"10" ] + %1 = landingpad { i8*, i32 } personality i32 (i32, i64, i8*, i8*)* @__gxx_personality_v0 + cleanup + resume { i8*, i32 } zeroinitializer +} + +declare void @_ZNK14gIndexOdometer9NoIndicesEv() + +declare i32 @__gxx_personality_v0(i32, i64, i8*, i8*) |