summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Trick <atrick@apple.com>2012-06-05 21:44:23 +0000
committerAndrew Trick <atrick@apple.com>2012-06-05 21:44:23 +0000
commitd88d27868bf7c2c5914c1b9ccace0ee6d7ee958a (patch)
tree41adde199c2b7add5180e5ba1fe5e33d19e0c8e9 /lib
parentb7e0289fb320c8440ba5eed121a8b932dbd806a2 (diff)
downloadllvm-d88d27868bf7c2c5914c1b9ccace0ee6d7ee958a.tar.gz
llvm-d88d27868bf7c2c5914c1b9ccace0ee6d7ee958a.tar.bz2
llvm-d88d27868bf7c2c5914c1b9ccace0ee6d7ee958a.tar.xz
MachineInstr::eraseFromParent fix for removing bundled instrs.
Patch by Ivan Llopard. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158025 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/MachineInstr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp
index 2dfb299843..a35978b5cd 100644
--- a/lib/CodeGen/MachineInstr.cpp
+++ b/lib/CodeGen/MachineInstr.cpp
@@ -872,7 +872,8 @@ void MachineInstr::eraseFromParent() {
MBB->erase(MI);
}
}
- getParent()->erase(this);
+ // Erase the individual instruction, which may itself be inside a bundle.
+ getParent()->erase_instr(this);
}