commit 60c994b98525a2301f1959094ee6f0da5d531805
author David Majnemer <david.majnemer@gmail.com> Sat Aug 08 03:51:49 2015 +0000
committer David Majnemer <david.majnemer@gmail.com> Sat Aug 08 03:51:49 2015 +0000
tree 4b3da93c36b9b3b94d16b5e821a30aac37890ac1
parent 67c4df83131db39680f370ba5cb28ab3139ae5a3

[InstCombine] Don't try to sink EH pad instructions

Found by inspection, this change should not effect the existing
landingpad behavior.

llvm-svn: 244391

llvm/lib/Transforms/InstCombine/InstructionCombining.cpp

diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index 45994d1..734056d 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -2672,7 +2672,7 @@
   assert(I->hasOneUse() && "Invariants didn't hold!");
 
   // Cannot move control-flow-involving, volatile loads, vaarg, etc.
-  if (isa<PHINode>(I) || isa<LandingPadInst>(I) || I->mayHaveSideEffects() ||
+  if (isa<PHINode>(I) || I->isEHPad() || I->mayHaveSideEffects() ||
       isa<TerminatorInst>(I))
     return false;
 
@@ -2975,7 +2975,7 @@
       Instruction *Inst = --I;
       if (!Inst->use_empty())
         Inst->replaceAllUsesWith(UndefValue::get(Inst->getType()));
-      if (isa<LandingPadInst>(Inst)) {
+      if (Inst->isEHPad()) {
         EndInst = Inst;
         continue;
       }