[llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructureAA.cpp Steensgaard.cpp
Chris Lattner
lattner at cs.uiuc.edu
Wed Feb 26 13:30:06 PST 2003
Changes in directory llvm/lib/Analysis/DataStructure:
DataStructureAA.cpp updated: 1.2 -> 1.3
Steensgaard.cpp updated: 1.27 -> 1.28
---
Log message:
Adjust to implement new AA interface
---
Diffs of the changes:
Index: llvm/lib/Analysis/DataStructure/DataStructureAA.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.2 llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.3
--- llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.2 Fri Feb 7 14:39:48 2003
+++ llvm/lib/Analysis/DataStructure/DataStructureAA.cpp Wed Feb 26 13:29:36 2003
@@ -24,11 +24,13 @@
// program.
//
bool run(Module &M) {
+ InitializeAliasAnalysis(this);
TD = &getAnalysis<TDDataStructures>();
return false;
}
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+ AliasAnalysis::getAnalysisUsage(AU);
AU.setPreservesAll(); // Does not transform code...
AU.addRequired<TDDataStructures>(); // Uses TD Datastructures
AU.addRequired<AliasAnalysis>(); // Chains to another AA impl...
@@ -39,19 +41,8 @@
//
// alias - This is the only method here that does anything interesting...
- Result alias(const Value *V1, const Value *V2);
-
- /// canCallModify - Not implemented yet: FIXME
- ///
- Result canCallModify(const CallInst &CI, const Value *Ptr) {
- return MayAlias;
- }
-
- /// canInvokeModify - Not implemented yet: FIXME
- ///
- Result canInvokeModify(const InvokeInst &I, const Value *Ptr) {
- return MayAlias;
- }
+ AliasResult alias(const Value *V1, unsigned V1Size,
+ const Value *V2, unsigned V2Size);
};
// Register the pass...
@@ -75,7 +66,9 @@
}
// alias - This is the only method here that does anything interesting...
-AliasAnalysis::Result DSAA::alias(const Value *V1, const Value *V2) {
+AliasAnalysis::AliasResult DSAA::alias(const Value *V1, unsigned V1Size,
+ const Value *V2, unsigned V2Size) {
+ // FIXME: This should handle the Size argument as well!
const Function *F1 = getValueFunction(V1);
const Function *F2 = getValueFunction(V2);
assert((!F1 || !F2 || F1 == F2) && "Alias query for 2 different functions?");
@@ -113,5 +106,5 @@
// FIXME: we could improve on this by checking the globals graph for aliased
// global queries...
- return getAnalysis<AliasAnalysis>().alias(V1, V2);
+ return getAnalysis<AliasAnalysis>().alias(V1, V1Size, V2, V2Size);
}
Index: llvm/lib/Analysis/DataStructure/Steensgaard.cpp
diff -u llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.27 llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.28
--- llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.27 Thu Feb 13 15:44:18 2003
+++ llvm/lib/Analysis/DataStructure/Steensgaard.cpp Wed Feb 26 13:29:36 2003
@@ -18,7 +18,7 @@
DSGraph *ResultGraph;
DSGraph *GlobalsGraph; // FIXME: Eliminate globals graph stuff from DNE
public:
- Steens() : ResultGraph(0) {}
+ Steens() : ResultGraph(0), GlobalsGraph(0) {}
~Steens() {
releaseMyMemory();
assert(ResultGraph == 0 && "releaseMemory not called?");
@@ -36,6 +36,7 @@
virtual void releaseMyMemory() { delete ResultGraph; ResultGraph = 0; }
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+ AliasAnalysis::getAnalysisUsage(AU);
AU.setPreservesAll(); // Does not transform code...
AU.addRequired<LocalDataStructures>(); // Uses local dsgraph
AU.addRequired<AliasAnalysis>(); // Chains to another AA impl...
@@ -52,20 +53,9 @@
//
// alias - This is the only method here that does anything interesting...
- Result alias(const Value *V1, const Value *V2);
+ AliasResult alias(const Value *V1, unsigned V1Size,
+ const Value *V2, unsigned V2Size);
- /// canCallModify - Not implemented yet: FIXME
- ///
- Result canCallModify(const CallInst &CI, const Value *Ptr) {
- return MayAlias;
- }
-
- /// canInvokeModify - Not implemented yet: FIXME
- ///
- Result canInvokeModify(const InvokeInst &I, const Value *Ptr) {
- return MayAlias;
- }
-
private:
void ResolveFunctionCall(Function *F, const DSCallSite &Call,
DSNodeHandle &RetVal);
@@ -108,6 +98,7 @@
/// program.
///
bool Steens::run(Module &M) {
+ InitializeAliasAnalysis(this);
assert(ResultGraph == 0 && "Result graph already allocated!");
LocalDataStructures &LDS = getAnalysis<LocalDataStructures>();
@@ -212,7 +203,9 @@
}
// alias - This is the only method here that does anything interesting...
-AliasAnalysis::Result Steens::alias(const Value *V1, const Value *V2) {
+AliasAnalysis::AliasResult Steens::alias(const Value *V1, unsigned V1Size,
+ const Value *V2, unsigned V2Size) {
+ // FIXME: HANDLE Size argument!
assert(ResultGraph && "Result graph has not been computed yet!");
hash_map<Value*, DSNodeHandle> &GSM = ResultGraph->getScalarMap();
@@ -239,5 +232,5 @@
// If we cannot determine alias properties based on our graph, fall back on
// some other AA implementation.
//
- return getAnalysis<AliasAnalysis>().alias(V1, V2);
+ return getAnalysis<AliasAnalysis>().alias(V1, V1Size, V2, V2Size);
}
More information about the llvm-commits
mailing list