diff options
| author | Dan Gohman <gohman@apple.com> | 2010-07-09 00:39:23 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2010-07-09 00:39:23 +0000 |
| commit | bf87e2491789d6ff788629e22e93d0c1ca02ae85 (patch) | |
| tree | 4bdfa29d7295871fad0d25d95f12a9d8434e02c8 /lib/CodeGen/SelectionDAG/InstrEmitter.cpp | |
| parent | 1cd050931fb429e4e2eab0fa4fe5b29e2cf4b9a4 (diff) | |
| download | external_llvm-bf87e2491789d6ff788629e22e93d0c1ca02ae85.tar.gz external_llvm-bf87e2491789d6ff788629e22e93d0c1ca02ae85.tar.bz2 external_llvm-bf87e2491789d6ff788629e22e93d0c1ca02ae85.zip | |
Re-apply bottom-up fast-isel, with fixes. Be very careful to avoid emitting
a DBG_VALUE after a terminator, or emitting any instructions before an EH_LABEL.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107943 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG/InstrEmitter.cpp')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/InstrEmitter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/InstrEmitter.cpp b/lib/CodeGen/SelectionDAG/InstrEmitter.cpp index d7d63d3dc6..40fb3a4698 100644 --- a/lib/CodeGen/SelectionDAG/InstrEmitter.cpp +++ b/lib/CodeGen/SelectionDAG/InstrEmitter.cpp @@ -734,8 +734,13 @@ 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(); + bool AtEnd = InsertPos == MBB->end(); + MachineBasicBlock *NewMBB = TLI->EmitInstrWithCustomInserter(MI, MBB); + if (NewMBB != MBB) { + if (AtEnd) + InsertPos = NewMBB->end(); + MBB = NewMBB; + } return; } |