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

be GCC 3.4 clean 

llvm-svn: 10264
This commit is contained in:
Chris Lattner 2003-11-29 19:55:12 +00:00
parent 594654f17d
commit 839030b3a8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
llvm/include/llvm/Analysis/InstForest.h
View File

@ -57,10 +57,10 @@ class InstTreeNode :
}; };
// Helper functions to make accessing our data nicer... // Helper functions to make accessing our data nicer...
const Value *getValue() const { return getTreeData().first.first; } const Value *getValue() const { return this->getTreeData().first.first; }
Value *getValue() { return getTreeData().first.first; } Value *getValue() { return this->getTreeData().first.first; }
enum NodeTypeTy getNodeType() const { enum NodeTypeTy getNodeType() const {
return (enum NodeTypeTy)getTreeData().first.second; return (enum NodeTypeTy)this->getTreeData().first.second;
} }
InstTreeNode(const InstTreeNode &); // Do not implement InstTreeNode(const InstTreeNode &); // Do not implement
@ -71,8 +71,8 @@ class InstTreeNode :
bool CanMergeInstIntoTree(Instruction *Inst); bool CanMergeInstIntoTree(Instruction *Inst);
public: public:
// Accessor functions... // Accessor functions...
inline Payload &getData() { return getTreeData().second; } inline Payload &getData() { return this->getTreeData().second; }
inline const Payload &getData() const { return getTreeData().second; } inline const Payload &getData() const { return this->getTreeData().second; }
// Type checking functions... // Type checking functions...
inline bool isConstant() const { return getNodeType() == ConstNode; } inline bool isConstant() const { return getNodeType() == ConstNode; }
@ -126,8 +126,8 @@ public:
o << getValue(); o << getValue();
if (!isa<Instruction>(getValue())) o << "\n"; if (!isa<Instruction>(getValue())) o << "\n";
for (unsigned i = 0; i < getNumChildren(); ++i) for (unsigned i = 0; i < this->getNumChildren(); ++i)
getChild(i)->print(o, Indent+1); this->getChild(i)->print(o, Indent+1);
} }
}; };
@ -161,9 +161,9 @@ class InstForest : public std::vector<InstTreeNode<Payload> *> {
} }
void removeInstFromRootList(Instruction *I) { void removeInstFromRootList(Instruction *I) {
for (unsigned i = size(); i > 0; --i) for (unsigned i = this->size(); i > 0; --i)
if (operator[](i-1)->getValue() == I) { if ((*this)[i-1]->getValue() == I) {
erase(begin()+i-1); this->erase(this->begin()+i-1);
return; return;
} }
} }
@ -182,8 +182,8 @@ public:
// dtor - Free the trees... // dtor - Free the trees...
~InstForest() { ~InstForest() {
for (unsigned i = size(); i != 0; --i) for (unsigned i = this->size(); i != 0; --i)
delete operator[](i-1); delete (*this)[i-1];
} }
// getInstNode - Return the instruction node that corresponds to the specified // getInstNode - Return the instruction node that corresponds to the specified
@ -205,7 +205,7 @@ public:
// print - Called by operator<< below... // print - Called by operator<< below...
void print(std::ostream &out) const { void print(std::ostream &out) const {
for (const_iterator I = begin(), E = end(); I != E; ++I) for (const_iterator I = this->begin(), E = this->end(); I != E; ++I)
out << *I; out << *I;
} }
}; };
@ -239,18 +239,18 @@ bool InstTreeNode<Payload>::CanMergeInstIntoTree(Instruction *I) {
template <class Payload> template <class Payload>
InstTreeNode<Payload>::InstTreeNode(InstForest<Payload> &IF, Value *V, InstTreeNode<Payload>::InstTreeNode(InstForest<Payload> &IF, Value *V,
InstTreeNode *Parent) : super(Parent) { InstTreeNode *Parent) : super(Parent) {
getTreeData().first.first = V; // Save tree node this->getTreeData().first.first = V; // Save tree node
if (!isa<Instruction>(V)) { if (!isa<Instruction>(V)) {
assert((isa<Constant>(V) || isa<BasicBlock>(V) || assert((isa<Constant>(V) || isa<BasicBlock>(V) ||
isa<Argument>(V) || isa<GlobalValue>(V)) && isa<Argument>(V) || isa<GlobalValue>(V)) &&
"Unrecognized value type for InstForest Partition!"); "Unrecognized value type for InstForest Partition!");
if (isa<Constant>(V)) if (isa<Constant>(V))
getTreeData().first.second = ConstNode; this->getTreeData().first.second = ConstNode;
else if (isa<BasicBlock>(V)) else if (isa<BasicBlock>(V))
getTreeData().first.second = BasicBlockNode; this->getTreeData().first.second = BasicBlockNode;
else else
getTreeData().first.second = TemporaryNode; this->getTreeData().first.second = TemporaryNode;
return; return;
} }
@ -259,7 +259,7 @@ InstTreeNode<Payload>::InstTreeNode(InstForest<Payload> &IF, Value *V,
Instruction *I = cast<Instruction>(V); Instruction *I = cast<Instruction>(V);
if (Parent && !Parent->CanMergeInstIntoTree(I)) { if (Parent && !Parent->CanMergeInstIntoTree(I)) {
// Not root node of tree, but mult uses? // Not root node of tree, but mult uses?
getTreeData().first.second = TemporaryNode; // Must be a temporary! this->getTreeData().first.second = TemporaryNode; // Must be a temporary!
return; return;
} }
@ -287,7 +287,7 @@ InstTreeNode<Payload>::InstTreeNode(InstForest<Payload> &IF, Value *V,
} }
setChildren(Children); setChildren(Children);
getTreeData().first.second = InstructionNode; this->getTreeData().first.second = InstructionNode;
} }
} // End llvm namespace } // End llvm namespace