From: Dan Gohman <gohman@apple.com>
Date: Wed, 7 Jul 2010 21:18:22 +0000 (+0000)
Subject: Not all custom inserters create new basic blocks. If the inserter
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5c480432b504bfbe8b3ba028f5f48e7e2e2f1f1e;p=oota-llvm.git

Not all custom inserters create new basic blocks. If the inserter
didn't create a new block, don't reset the insert position.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107813 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/SelectionDAG/InstrEmitter.cpp b/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
index f36620c3edf..5f93e2fcb2e 100644
--- a/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
+++ b/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
@@ -732,8 +732,11 @@ EmitMachineNode(SDNode *Node, bool IsClone, bool IsCloned,
   if (II.usesCustomInsertionHook()) {
     // Insert this instruction into the basic block using a target
     // specific inserter which may returns a new basic block.
-    MBB = TLI->EmitInstrWithCustomInserter(MI, MBB);
-    InsertPos = MBB->end();
+    MachineBasicBlock *NewMBB = TLI->EmitInstrWithCustomInserter(MI, MBB);
+    if (NewMBB != MBB) {
+      MBB = NewMBB;
+      InsertPos = NewMBB->end();
+    }
     return;
   }