From 67c2d18166080d74cee60857261cae2ada776a5d Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 18 Mar 2005 16:12:37 +0000 Subject: [PATCH] remove use of getPrev() and getNext() on ilist nodes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20673 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/CBackend/CBackend.cpp | 13 ++++++++----- lib/Target/CBackend/Writer.cpp | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index cebff7508c2..109d66f9232 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -33,6 +33,7 @@ #include "llvm/Support/InstVisitor.h" #include "llvm/Support/Mangler.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Support/MathExtras.h" #include "llvm/Config/config.h" #include @@ -1246,7 +1247,7 @@ void CWriter::visitSwitchInst(SwitchInst &SI) { BasicBlock *Succ = cast(SI.getOperand(i+1)); printPHICopiesForSuccessor (SI.getParent(), Succ, 2); printBranchToBlock(SI.getParent(), Succ, 2); - if (Succ == SI.getParent()->getNext()) + if (Succ == next(Function::iterator(SI.getParent()))) Out << " break;\n"; } Out << " }\n"; @@ -1260,12 +1261,11 @@ bool CWriter::isGotoCodeNecessary(BasicBlock *From, BasicBlock *To) { /// FIXME: This should be reenabled, but loop reordering safe!! return true; - if (From->getNext() != To) // Not the direct successor, we need a goto - return true; + if (next(Function::iterator(From)) != Function::iterator(To)) + return true; // Not the direct successor, we need a goto. //isa(From->getTerminator()) - if (LI->getLoopFor(From) != LI->getLoopFor(To)) return true; return false; @@ -1443,7 +1443,10 @@ void CWriter::lowerIntrinsics(Function &F) { break; default: // All other intrinsic calls we must lower. - Instruction *Before = CI->getPrev(); + Instruction *Before = 0; + if (CI != &BB->front()) + Before = prior(BasicBlock::iterator(CI)); + IL.LowerIntrinsicCall(CI); if (Before) { // Move iterator to instruction after call I = Before; ++I; diff --git a/lib/Target/CBackend/Writer.cpp b/lib/Target/CBackend/Writer.cpp index cebff7508c2..109d66f9232 100644 --- a/lib/Target/CBackend/Writer.cpp +++ b/lib/Target/CBackend/Writer.cpp @@ -33,6 +33,7 @@ #include "llvm/Support/InstVisitor.h" #include "llvm/Support/Mangler.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Support/MathExtras.h" #include "llvm/Config/config.h" #include @@ -1246,7 +1247,7 @@ void CWriter::visitSwitchInst(SwitchInst &SI) { BasicBlock *Succ = cast(SI.getOperand(i+1)); printPHICopiesForSuccessor (SI.getParent(), Succ, 2); printBranchToBlock(SI.getParent(), Succ, 2); - if (Succ == SI.getParent()->getNext()) + if (Succ == next(Function::iterator(SI.getParent()))) Out << " break;\n"; } Out << " }\n"; @@ -1260,12 +1261,11 @@ bool CWriter::isGotoCodeNecessary(BasicBlock *From, BasicBlock *To) { /// FIXME: This should be reenabled, but loop reordering safe!! return true; - if (From->getNext() != To) // Not the direct successor, we need a goto - return true; + if (next(Function::iterator(From)) != Function::iterator(To)) + return true; // Not the direct successor, we need a goto. //isa(From->getTerminator()) - if (LI->getLoopFor(From) != LI->getLoopFor(To)) return true; return false; @@ -1443,7 +1443,10 @@ void CWriter::lowerIntrinsics(Function &F) { break; default: // All other intrinsic calls we must lower. - Instruction *Before = CI->getPrev(); + Instruction *Before = 0; + if (CI != &BB->front()) + Before = prior(BasicBlock::iterator(CI)); + IL.LowerIntrinsicCall(CI); if (Before) { // Move iterator to instruction after call I = Before; ++I; -- 2.34.1