Updates to work with the new auto-forwarding AA interface changes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13682 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/Analysis/DataStructure/DataStructureAA.cpp b/lib/Analysis/DataStructure/DataStructureAA.cpp
index 99b5726632..2c38972926 100644
--- a/lib/Analysis/DataStructure/DataStructureAA.cpp
+++ b/lib/Analysis/DataStructure/DataStructureAA.cpp
@@ -44,7 +44,6 @@ namespace {
       AU.setPreservesAll();                         // Does not transform code
       AU.addRequiredTransitive<TDDataStructures>(); // Uses TD Datastructures
       AU.addRequiredTransitive<BUDataStructures>(); // Uses BU Datastructures
-      AU.addRequired<AliasAnalysis>();              // Chains to another AA impl
     }
 
     //------------------------------------------------
@@ -56,12 +55,7 @@ namespace {
 
     void getMustAliases(Value *P, std::vector<Value*> &RetVals);
 
-    bool pointsToConstantMemory(const Value *P) {
-      return getAnalysis<AliasAnalysis>().pointsToConstantMemory(P);
-    }
-    
-    AliasAnalysis::ModRefResult
-    getModRefInfo(CallSite CS, Value *P, unsigned Size);
+    ModRefResult getModRefInfo(CallSite CS, Value *P, unsigned Size);
 
   private:
     DSGraph *getGraphForValue(const Value *V);
@@ -155,7 +149,7 @@ AliasAnalysis::AliasResult DSAA::alias(const Value *V1, unsigned V1Size,
 
   // FIXME: we could improve on this by checking the globals graph for aliased
   // global queries...
-  return getAnalysis<AliasAnalysis>().alias(V1, V1Size, V2, V2Size);
+  return AliasAnalysis::alias(V1, V1Size, V2, V2Size);
 }
 
 /// getModRefInfo - does a callsite modify or reference a value?
@@ -212,6 +206,6 @@ void DSAA::getMustAliases(Value *P, std::vector<Value*> &RetVals) {
     }
   }
 #endif
-  return getAnalysis<AliasAnalysis>().getMustAliases(P, RetVals);
+  return AliasAnalysis::getMustAliases(P, RetVals);
 }