diff options
| -rw-r--r-- | llvm/include/llvm/IR/SymbolTableListTraits.h | 2 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/MachineVerifier.cpp | 7 | ||||
| -rw-r--r-- | llvm/lib/IR/SymbolTableListTraitsImpl.h | 3 | ||||
| -rw-r--r-- | llvm/lib/IR/Verifier.cpp | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/llvm/include/llvm/IR/SymbolTableListTraits.h b/llvm/include/llvm/IR/SymbolTableListTraits.h index 673f168dd69..713985f51d5 100644 --- a/llvm/include/llvm/IR/SymbolTableListTraits.h +++ b/llvm/include/llvm/IR/SymbolTableListTraits.h @@ -62,7 +62,7 @@ template <typename NodeTy> class SymbolTableList; template <typename ValueSubClass> class SymbolTableListTraits : public ilist_alloc_traits<ValueSubClass> { typedef SymbolTableList<ValueSubClass> ListTy; - typedef ilist_iterator<ValueSubClass, false> iterator; + typedef typename simple_ilist<ValueSubClass>::iterator iterator; typedef typename SymbolTableListParentType<ValueSubClass>::type ItemParentClass; diff --git a/llvm/lib/CodeGen/MachineVerifier.cpp b/llvm/lib/CodeGen/MachineVerifier.cpp index 0b8a85d9af7..49620e7a32d 100644 --- a/llvm/lib/CodeGen/MachineVerifier.cpp +++ b/llvm/lib/CodeGen/MachineVerifier.cpp @@ -208,9 +208,6 @@ namespace { void visitMachineBasicBlockAfter(const MachineBasicBlock *MBB); void visitMachineFunctionAfter(); - template <typename T> void report(const char *msg, ilist_iterator<T> I) { - report(msg, &*I); - } void report(const char *msg, const MachineFunction *MF); void report(const char *msg, const MachineBasicBlock *MBB); void report(const char *msg, const MachineInstr *MI); @@ -365,7 +362,7 @@ unsigned MachineVerifier::verify(MachineFunction &MF) { for (MachineBasicBlock::const_instr_iterator MBBI = MFI->instr_begin(), MBBE = MFI->instr_end(); MBBI != MBBE; ++MBBI) { if (MBBI->getParent() != &*MFI) { - report("Bad instruction parent pointer", MFI); + report("Bad instruction parent pointer", &*MFI); errs() << "Instruction: " << *MBBI; continue; } @@ -387,7 +384,7 @@ unsigned MachineVerifier::verify(MachineFunction &MF) { CurBundle = &*MBBI; visitMachineBundleBefore(CurBundle); } else if (!CurBundle) - report("No bundle header", MBBI); + report("No bundle header", &*MBBI); visitMachineInstrBefore(&*MBBI); for (unsigned I = 0, E = MBBI->getNumOperands(); I != E; ++I) { const MachineInstr &MI = *MBBI; diff --git a/llvm/lib/IR/SymbolTableListTraitsImpl.h b/llvm/lib/IR/SymbolTableListTraitsImpl.h index a55cf6a35a0..6ddab6b4c69 100644 --- a/llvm/lib/IR/SymbolTableListTraitsImpl.h +++ b/llvm/lib/IR/SymbolTableListTraitsImpl.h @@ -81,8 +81,7 @@ void SymbolTableListTraits<ValueSubClass>::removeNodeFromList( template <typename ValueSubClass> void SymbolTableListTraits<ValueSubClass>::transferNodesFromList( - SymbolTableListTraits &L2, ilist_iterator<ValueSubClass> first, - ilist_iterator<ValueSubClass> last) { + SymbolTableListTraits &L2, iterator first, iterator last) { // We only have to do work here if transferring instructions between BBs ItemParentClass *NewIP = getListOwner(), *OldIP = L2.getListOwner(); assert(NewIP != OldIP && "Expected different list owners"); diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index a4592313f36..6e9eb7476a1 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -137,10 +137,6 @@ struct VerifierSupport { : OS(OS), M(M), MST(&M), DL(M.getDataLayout()), Context(M.getContext()) {} private: - template <class NodeTy> void Write(const ilist_iterator<NodeTy> &I) { - Write(&*I); - } - void Write(const Module *M) { *OS << "; ModuleID = '" << M->getModuleIdentifier() << "'\n"; } |
