wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CodeGen: Fixup for r280128, since GCC isn't as permissive as Clang 

Fixes the bots, e.g.:
http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-buildserver/builds/10055

llvm-svn: 280135
This commit is contained in:
Duncan P. N. Exon Smith 2016-08-30 19:11:11 +00:00
parent dd4ad3d2ad
commit 73b8dbdd94
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/include/llvm/CodeGen/MachineBasicBlock.h
View File

@ -46,9 +46,9 @@ private:
public:
void addNodeToList(MachineInstr *N);
void removeNodeFromList(MachineInstr *N);
template <class Iterator>
void transferNodesFromList(ilist_traits &OldList, Iterator First,
Iterator Last);
void transferNodesFromList(ilist_traits &OldList,
simple_ilist<MachineInstr>::iterator First,
simple_ilist<MachineInstr>::iterator Last);
void deleteNode(MachineInstr *MI);
// Leave out createNode...

8
llvm/lib/CodeGen/MachineBasicBlock.cpp
View File

@ -118,11 +118,9 @@ void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr *N) {
/// When moving a range of instructions from one MBB list to another, we need to
/// update the parent pointers and the use/def lists.
template <>
void ilist_traits<MachineInstr>::transferNodesFromList<
ilist<MachineInstr>::iterator>(ilist_traits<MachineInstr> &FromList,
ilist<MachineInstr>::iterator First,
ilist<MachineInstr>::iterator Last) {
void ilist_traits<MachineInstr>::transferNodesFromList(
ilist_traits &FromList, simple_ilist<MachineInstr>::iterator First,
simple_ilist<MachineInstr>::iterator Last) {
assert(Parent->getParent() == FromList.Parent->getParent() &&
"MachineInstr parent mismatch!");
assert(this != &FromList && "Called without a real transfer...");