commit 8de1fe23ed8a5cd56a5f3b12cd6a9135a24000ae
author Reid Kleckner <rnk@google.com> Tue Dec 08 23:00:03 2015 +0000
committer Reid Kleckner <rnk@google.com> Tue Dec 08 23:00:03 2015 +0000
tree d89f743661b5313f9c13e70009c84a9168011508
parent d87e4354a739ac9e372bc347db9755992b80debe

[CGP] Reimplement r255055 a different way

llvm-svn: 255070

llvm/lib/CodeGen/CodeGenPrepare.cpp

diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index d619044..30af1c5 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -5251,6 +5251,10 @@
 
       Instruction *VI = dyn_cast_or_null<Instruction>(DVI->getValue());
       if (VI && VI != PrevNonDbgInst && !VI->isTerminator()) {
+        // If VI is a phi in a block with an EHPad terminator, we can't insert
+        // after it.
+        if (isa<PHINode>(VI) && VI->getParent()->getTerminator()->isEHPad())
+          continue;
         DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI);
         DVI->removeFromParent();
         if (isa<PHINode>(VI))