replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes to fix up the inst_iterator to pass to boost iterator checks. This 

patch was graciously contributed by Vladimir Prus.

llvm-svn: 13185
This commit is contained in:
Chris Lattner 2004-04-27 15:13:33 +00:00
parent 8bcc86b6ae
commit 2d3a7a6ff0
12 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
llvm/include/llvm/Support/InstIterator.h
View File

@ -33,15 +33,18 @@ class InstIterator {
typedef _BB_i_t BBIty;
typedef _BI_t BIty;
typedef _II_t IIty;
_BB_t &BBs; // BasicBlocksType
_BB_t *BBs; // BasicBlocksType
_BB_i_t BB; // BasicBlocksType::iterator
_BI_t BI; // BasicBlock::iterator
public:
typedef std::bidirectional_iterator_tag iterator_category;
typedef IIty value_type;
typedef unsigned difference_type;
typedef BIty pointer;
typedef IIty reference;
typedef signed difference_type;
typedef IIty* pointer;
typedef IIty& reference;
// Default constructor
InstIterator() {}
// Copy constructor...
template<typename A, typename B, typename C, typename D>
@ -53,26 +56,26 @@ public:
: BBs(II.BBs), BB(II.BB), BI(II.BI) {}
template<class M> InstIterator(M &m)
: BBs(m.getBasicBlockList()), BB(BBs.begin()) { // begin ctor
if (BB != BBs.end()) {
: BBs(&m.getBasicBlockList()), BB(BBs->begin()) { // begin ctor
if (BB != BBs->end()) {
BI = BB->begin();
advanceToNextBB();
}
}
template<class M> InstIterator(M &m, bool)
: BBs(m.getBasicBlockList()), BB(BBs.end()) { // end ctor
: BBs(&m.getBasicBlockList()), BB(BBs->end()) { // end ctor
}
// Accessors to get at the underlying iterators...
inline BBIty &getBasicBlockIterator() { return BB; }
inline BIty &getInstructionIterator() { return BI; }
inline IIty operator*() const { return BI; }
inline IIty operator->() const { return operator*(); }
inline reference operator*() const { return *BI; }
inline pointer operator->() const { return &operator*(); }
inline bool operator==(const InstIterator &y) const {
return BB == y.BB && (BB == BBs.end() || BI == y.BI);
return BB == y.BB && (BB == BBs->end() || BI == y.BI);
}
inline bool operator!=(const InstIterator& y) const {
return !operator==(y);
@ -88,7 +91,7 @@ public:
}
InstIterator& operator--() {
while (BB == BBs.end() || BI == BB->begin()) {
while (BB == BBs->end() || BI == BB->begin()) {
--BB;
BI = BB->end();
}
@ -99,7 +102,7 @@ public:
InstIterator tmp = *this; --*this; return tmp;
}
inline bool atEnd() const { return BB == BBs.end(); }
inline bool atEnd() const { return BB == BBs->end(); }
private:
inline void advanceToNextBB() {
@ -107,7 +110,7 @@ private:
// the end() of the current BasicBlock and there are successor BBs.
while (BI == BB->end()) {
++BB;
if (BB == BBs.end()) break;
if (BB == BBs->end()) break;
BI = BB->begin();
}
}
@ -116,11 +119,11 @@ private:
typedef InstIterator<iplist<BasicBlock>,
Function::iterator, BasicBlock::iterator,
Instruction*> inst_iterator;
Instruction> inst_iterator;
typedef InstIterator<const iplist<BasicBlock>,
Function::const_iterator,
BasicBlock::const_iterator,
const Instruction*> const_inst_iterator;
const Instruction> const_inst_iterator;
inline inst_iterator inst_begin(Function *F) { return inst_iterator(*F); }
inline inst_iterator inst_end(Function *F) { return inst_iterator(*F, true); }

8
llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
View File

@ -83,15 +83,15 @@ bool AAEval::runOnFunction(Function &F) {
Pointers.insert(I);
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
if (isa<PointerType>((*I)->getType())) // Add all pointer instructions
Pointers.insert(*I);
for (User::op_iterator OI = (*I)->op_begin(); OI != (*I)->op_end(); ++OI)
if (isa<PointerType>(I->getType())) // Add all pointer instructions
Pointers.insert(&*I);
for (User::op_iterator OI = (*I).op_begin(); OI != (*I).op_end(); ++OI)
if (isa<PointerType>((*OI)->getType()))
Pointers.insert(*OI);
}
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
CallSite CS = CallSite::get(*I);
CallSite CS = CallSite::get(&*I);
if (CS.getInstruction()) CallSites.insert(CS);
}

2
llvm/lib/Analysis/AliasSetTracker.cpp
View File

@ -366,7 +366,7 @@ namespace {
Tracker = new AliasSetTracker(getAnalysis<AliasAnalysis>());
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
Tracker->add(*I);
Tracker->add(&*I);
return false;
}

6
llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
View File

@ -42,8 +42,8 @@ static cl::opt<bool>
PrintFailures("printunsafeptrinst", cl::Hidden,
cl::desc("Print Unsafe Pointer Access Instructions"));
static inline bool isSafeInstruction(const Instruction *I) {
switch (I->getOpcode()) {
static inline bool isSafeInstruction(const Instruction &I) {
switch (I.getOpcode()) {
case Instruction::Alloca:
case Instruction::Malloc:
case Instruction::Free:
@ -72,7 +72,7 @@ bool FindUnsafePointerTypes::run(Module &Mod) {
if (PrintFailures) {
CachedWriter CW(F->getParent(), std::cerr);
CW << "FindUnsafePointerTypes: Type '" << ITy
<< "' marked unsafe in '" << F->getName() << "' by:\n" << **I;
<< "' marked unsafe in '" << F->getName() << "' by:\n" << *I;
}
}
}

6
llvm/lib/Analysis/IPA/FindUsedTypes.cpp
View File

@ -79,11 +79,11 @@ bool FindUsedTypes::run(Module &m) {
//
for (const_inst_iterator II = inst_begin(F), IE = inst_end(F);
II != IE; ++II) {
const Instruction *I = *II;
const Type *Ty = I->getType();
const Instruction &I = *II;
const Type *Ty = I.getType();
IncorporateType(Ty); // Incorporate the type of the instruction
for (User::const_op_iterator OI = I->op_begin(), OE = I->op_end();
for (User::const_op_iterator OI = I.op_begin(), OE = I.op_end();
OI != OE; ++OI)
IncorporateValue(*OI); // Insert inst operand types as well
}

12
llvm/lib/Analysis/ScalarEvolution.cpp
View File

@ -2175,22 +2175,22 @@ void ScalarEvolution::print(std::ostream &OS) const {
OS << "Classifying expressions for: " << F.getName() << "\n";
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
if ((*I)->getType()->isInteger()) {
OS << **I;
if (I->getType()->isInteger()) {
OS << *I;
OS << " --> ";
SCEVHandle SV = getSCEV(*I);
SCEVHandle SV = getSCEV(&*I);
SV->print(OS);
OS << "\t\t";
if ((*I)->getType()->isIntegral()) {
if ((*I).getType()->isIntegral()) {
ConstantRange Bounds = SV->getValueRange();
if (!Bounds.isFullSet())
OS << "Bounds: " << Bounds << " ";
}
if (const Loop *L = LI.getLoopFor((*I)->getParent())) {
if (const Loop *L = LI.getLoopFor((*I).getParent())) {
OS << "Exits: ";
SCEVHandle ExitValue = getSCEVAtScope(*I, L->getParentLoop());
SCEVHandle ExitValue = getSCEVAtScope(&*I, L->getParentLoop());
if (isa<SCEVCouldNotCompute>(ExitValue)) {
OS << "<<Unknown>>";
} else {

10
llvm/lib/Target/CBackend/Writer.cpp
View File

@ -955,19 +955,19 @@ void CWriter::printFunction(Function &F) {
// print local variable information for the function
for (inst_iterator I = inst_begin(&F), E = inst_end(&F); I != E; ++I)
if (const AllocaInst *AI = isDirectAlloca(*I)) {
if (const AllocaInst *AI = isDirectAlloca(&*I)) {
Out << " ";
printType(Out, AI->getAllocatedType(), Mang->getValueName(AI));
Out << "; /* Address exposed local */\n";
} else if ((*I)->getType() != Type::VoidTy && !isInlinableInst(**I)) {
} else if (I->getType() != Type::VoidTy && !isInlinableInst(*I)) {
Out << " ";
printType(Out, (*I)->getType(), Mang->getValueName(*I));
printType(Out, I->getType(), Mang->getValueName(&*I));
Out << ";\n";
if (isa<PHINode>(*I)) { // Print out PHI node temporaries as well...
Out << " ";
printType(Out, (*I)->getType(),
Mang->getValueName(*I)+"__PHI_TEMPORARY");
printType(Out, I->getType(),
Mang->getValueName(&*I)+"__PHI_TEMPORARY");
Out << ";\n";
}
}

8
llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
View File

@ -1167,9 +1167,9 @@ void PhyRegAlloc::saveState () {
unsigned Insn = 0;
// Instructions themselves encoded as operand # -1
for (const_inst_iterator II=inst_begin (Fn), IE=inst_end (Fn); II!=IE; ++II){
saveStateForValue (state, (*II), Insn, -1);
for (unsigned i = 0; i < (*II)->getNumOperands (); ++i) {
const Value *V = (*II)->getOperand (i);
saveStateForValue (state, (&*II), Insn, -1);
for (unsigned i = 0; i < (*II).getNumOperands (); ++i) {
const Value *V = (*II).getOperand (i);
// Don't worry about it unless it's something whose reg. we'll need.
if (!isa<Argument> (V) && !isa<Instruction> (V))
continue;
@ -1201,7 +1201,7 @@ void PhyRegAlloc::verifySavedState () {
}
int Insn = 0;
for (const_inst_iterator II=inst_begin (Fn), IE=inst_end (Fn); II!=IE; ++II) {
const Instruction *I = *II;
const Instruction *I = &*II;
MachineCodeForInstruction &Instrs = MachineCodeForInstruction::get (I);
std::cerr << "Instruction: " << *I
<< "MachineCodeForInstruction:\n";

5
llvm/lib/Transforms/Scalar/ConstantProp.cpp
View File

@ -49,7 +49,10 @@ Pass *llvm::createConstantPropagationPass() {
bool ConstantPropagation::runOnFunction(Function &F) {
// Initialize the worklist to all of the instructions ready to process...
std::set<Instruction*> WorkList(inst_begin(F), inst_end(F));
std::set<Instruction*> WorkList;
for(inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
WorkList.insert(&*i);
}
bool Changed = false;
while (!WorkList.empty()) {

5
llvm/lib/Transforms/Scalar/DCE.cpp
View File

@ -76,7 +76,10 @@ namespace {
bool DCE::runOnFunction(Function &F) {
// Start out with all of the instructions in the worklist...
std::vector<Instruction*> WorkList(inst_begin(F), inst_end(F));
std::vector<Instruction*> WorkList;
for (inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
WorkList.push_back(&*i);
}
std::set<Instruction*> DeadInsts;
// Loop over the worklist finding instructions that are dead. If they are

5
llvm/lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -2934,7 +2934,10 @@ bool InstCombiner::runOnFunction(Function &F) {
bool Changed = false;
TD = &getAnalysis<TargetData>();
WorkList.insert(WorkList.end(), inst_begin(F), inst_end(F));
for (inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
WorkList.push_back(&*i);
}
while (!WorkList.empty()) {
Instruction *I = WorkList.back(); // Get an instruction from the worklist

4
llvm/lib/VMCore/SlotCalculator.cpp
View File

@ -186,7 +186,7 @@ void SlotCalculator::processModule() {
if (isa<Constant>(I->getOperand(op)))
getOrCreateSlot(I->getOperand(op));
getOrCreateSlot(I->getType());
if (const VANextInst *VAN = dyn_cast<VANextInst>(*I))
if (const VANextInst *VAN = dyn_cast<VANextInst>(&*I))
getOrCreateSlot(VAN->getArgType());
}
processSymbolTableConstants(&F->getSymbolTable());
@ -448,7 +448,7 @@ void SlotCalculator::buildCompactionTable(const Function *F) {
if (isa<Constant>(I->getOperand(op)) ||
isa<GlobalValue>(I->getOperand(op)))
getOrCreateCompactionTableSlot(I->getOperand(op));
if (const VANextInst *VAN = dyn_cast<VANextInst>(*I))
if (const VANextInst *VAN = dyn_cast<VANextInst>(&*I))
getOrCreateCompactionTableSlot(VAN->getArgType());
}