diff options
author | Bill Wendling <isanbard@gmail.com> | 2011-08-16 20:45:24 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2011-08-16 20:45:24 +0000 |
commit | 5b6f42f57e730c2d968c313a27fa505a3c3e5efa (patch) | |
tree | aee4fbd451c00de169c171710e4ee9becd07b2aa /lib/Transforms/InstCombine | |
parent | d2e103daf8a093e0e25ddbaa7549c083887196e8 (diff) | |
download | external_llvm-5b6f42f57e730c2d968c313a27fa505a3c3e5efa.zip external_llvm-5b6f42f57e730c2d968c313a27fa505a3c3e5efa.tar.gz external_llvm-5b6f42f57e730c2d968c313a27fa505a3c3e5efa.tar.bz2 |
Use the getFirstInsertionPt() method instead of getFirstNonPHI + an 'isa<>'
check for a LandingPadInst.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137745 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/InstCombine')
-rw-r--r-- | lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp | 3 | ||||
-rw-r--r-- | lib/Transforms/InstCombine/InstructionCombining.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp index b987340..7446a51 100644 --- a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp +++ b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp @@ -600,8 +600,7 @@ bool InstCombiner::SimplifyStoreAtEndOfBlock(StoreInst &SI) { // Advance to a place where it is safe to insert the new store and // insert it. - BBI = DestBB->getFirstNonPHI(); - if (isa<LandingPadInst>(BBI)) ++BBI; + BBI = DestBB->getFirstInsertionPt(); StoreInst *NewSI = new StoreInst(MergedVal, SI.getOperand(1), SI.isVolatile(), SI.getAlignment(), diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp index f13733c..47e7dd4 100644 --- a/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -1435,8 +1435,7 @@ static bool TryToSinkInstruction(Instruction *I, BasicBlock *DestBlock) { return false; } - BasicBlock::iterator InsertPos = DestBlock->getFirstNonPHI(); - if (isa<LandingPadInst>(InsertPos)) ++InsertPos; // Skip landingpad inst. + BasicBlock::iterator InsertPos = DestBlock->getFirstInsertionPt(); I->moveBefore(InsertPos); ++NumSunkInst; return true; |