From 5e38c473a41f4412d8a934449290b11066d144b9 Mon Sep 17 00:00:00 2001
From: Bill Wendling <isanbard@gmail.com>
Date: Mon, 15 Aug 2011 23:19:54 +0000
Subject: [PATCH] In places where it's using "getFirstNonPHI", skip the
 landingpad instruction if necessary.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137679 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Transforms/Scalar/CodeGenPrepare.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp
index c274b1595a7..fb4e8a4c9d8 100644
--- a/lib/Transforms/Scalar/CodeGenPrepare.cpp
+++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp
@@ -469,7 +469,7 @@ static bool OptimizeCmpExpression(CmpInst *CI) {
 
     if (!InsertedCmp) {
       BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
-
+      if (isa<LandingPadInst>(InsertPt)) ++InsertPt; // Skip landingpad inst.
       InsertedCmp =
         CmpInst::Create(CI->getOpcode(),
                         CI->getPredicate(),  CI->getOperand(0),
@@ -561,10 +561,13 @@ bool CodeGenPrepare::OptimizeCallInst(CallInst *CI) {
           (DVI->getParent() != VI->getParent() || DT->dominates(DVI, VI))) {
         DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI);
         DVI->removeFromParent();
-        if (isa<PHINode>(VI))
-          DVI->insertBefore(VI->getParent()->getFirstNonPHI());
-        else
+        if (isa<PHINode>(VI)) {
+          BasicBlock::iterator InsertPt = VI->getParent()->getFirstNonPHI();
+          if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
+          DVI->insertBefore(InsertPt);
+        } else {
           DVI->insertAfter(VI);
+        }
         return true;
       }
 
@@ -1061,7 +1064,7 @@ bool CodeGenPrepare::OptimizeExtUses(Instruction *I) {
 
     if (!InsertedTrunc) {
       BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
-
+      if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
       InsertedTrunc = new TruncInst(I, Src->getType(), "", InsertPt);
     }