[llvm-commits] CVS: llvm/include/llvm/Analysis/DataStructure/DataStructure.h EquivClassGraphs.h
Chris Lattner
lattner at cs.uiuc.edu
Sat Apr 2 11:15:32 PST 2005
Changes in directory llvm/include/llvm/Analysis/DataStructure:
DataStructure.h updated: 1.89 -> 1.90
EquivClassGraphs.h updated: 1.19 -> 1.20
---
Log message:
Change the ActualCallees callgraph from hash_multimap<Instruction,Function>
to std::set<std::pair<Inst,Func>> to avoid duplicate entries.
---
Diffs of the changes: (+24 -6)
DataStructure.h | 17 +++++++++++++----
EquivClassGraphs.h | 13 +++++++++++--
2 files changed, 24 insertions(+), 6 deletions(-)
Index: llvm/include/llvm/Analysis/DataStructure/DataStructure.h
diff -u llvm/include/llvm/Analysis/DataStructure/DataStructure.h:1.89 llvm/include/llvm/Analysis/DataStructure/DataStructure.h:1.90
--- llvm/include/llvm/Analysis/DataStructure/DataStructure.h:1.89 Wed Mar 23 15:59:31 2005
+++ llvm/include/llvm/Analysis/DataStructure/DataStructure.h Sat Apr 2 13:15:15 2005
@@ -102,7 +102,7 @@
// DSInfo, one graph for each function
hash_map<Function*, DSGraph*> DSInfo;
DSGraph *GlobalsGraph;
- hash_multimap<Instruction*, Function*> ActualCallees;
+ std::set<std::pair<Instruction*, Function*> > ActualCallees;
// This map is only maintained during construction of BU Graphs
std::map<std::vector<Function*>,
@@ -152,11 +152,20 @@
AU.addRequired<LocalDataStructures>();
}
- typedef hash_multimap<Instruction*, Function*> ActualCalleesTy;
+ typedef std::set<std::pair<Instruction*, Function*> > ActualCalleesTy;
const ActualCalleesTy &getActualCallees() const {
return ActualCallees;
}
+ ActualCalleesTy::iterator callee_begin(Instruction *I) const {
+ return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
+ }
+
+ ActualCalleesTy::iterator callee_end(Instruction *I) const {
+ I = (Instruction*)((char*)I + 1);
+ return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
+ }
+
private:
void calculateGraph(DSGraph &G);
@@ -177,6 +186,7 @@
hash_map<Function*, DSGraph*> DSInfo;
hash_set<Function*> ArgsRemainIncomplete;
DSGraph *GlobalsGraph;
+ BUDataStructures *BUInfo;
/// GlobalECs - The equivalence classes for each global value that is merged
/// with other global values in the DSGraphs.
@@ -257,8 +267,7 @@
void InlineCallersIntoGraph(DSGraph &G);
DSGraph &getOrCreateDSGraph(Function &F);
void ComputePostOrder(Function &F, hash_set<DSGraph*> &Visited,
- std::vector<DSGraph*> &PostOrder,
- const BUDataStructures::ActualCalleesTy &ActualCallees);
+ std::vector<DSGraph*> &PostOrder);
};
Index: llvm/include/llvm/Analysis/DataStructure/EquivClassGraphs.h
diff -u llvm/include/llvm/Analysis/DataStructure/EquivClassGraphs.h:1.19 llvm/include/llvm/Analysis/DataStructure/EquivClassGraphs.h:1.20
--- llvm/include/llvm/Analysis/DataStructure/EquivClassGraphs.h:1.19 Sat Mar 19 16:12:33 2005
+++ llvm/include/llvm/Analysis/DataStructure/EquivClassGraphs.h Sat Apr 2 13:15:15 2005
@@ -39,7 +39,7 @@
/// ActualCallees - The actual functions callable from indirect call sites.
///
- hash_multimap<Instruction*, Function*> ActualCallees;
+ std::set<std::pair<Instruction*, Function*> > ActualCallees;
// Equivalence class where functions that can potentially be called via the
// same function pointer are in the same class.
@@ -96,10 +96,19 @@
return *GlobalsGraph;
}
- typedef hash_multimap<Instruction*, Function*> ActualCalleesTy;
+ typedef std::set<std::pair<Instruction*, Function*> > ActualCalleesTy;
const ActualCalleesTy &getActualCallees() const {
return ActualCallees;
}
+
+ ActualCalleesTy::iterator callee_begin(Instruction *I) const {
+ return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
+ }
+
+ ActualCalleesTy::iterator callee_end(Instruction *I) const {
+ I = (Instruction*)((char*)I + 1);
+ return ActualCallees.lower_bound(std::pair<Instruction*,Function*>(I, 0));
+ }
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesAll();
More information about the llvm-commits
mailing list