MachineBasicBlock::splice was incorrectly updating parent pointers on

instructions.

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

diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 3b486d6..318259d 100644 (file)
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -66,12 +66,12 @@ void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N) {
 }
 
 void ilist_traits<MachineInstr>::transferNodesFromList(
-  iplist<MachineInstr, ilist_traits<MachineInstr> >& toList,
+  iplist<MachineInstr, ilist_traits<MachineInstr> >& fromList,
   ilist_iterator<MachineInstr> first,
   ilist_iterator<MachineInstr> last) {
-  if (parent != toList.parent)
+  if (parent != fromList.parent)
     for (; first != last; ++first)
-      first->parent = toList.parent;
+      first->parent = parent;
 }
 
 MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {