Do not overuse std::string. Pass around char * directly.

[oota-llvm.git] / lib / Analysis / AliasAnalysis.cpp

diff --git a/lib/Analysis/AliasAnalysis.cpp b/lib/Analysis/AliasAnalysis.cpp
index 0e3f159ac040c740c3becdeb09077b7f7110d56c..5ae2342404557b25d3641f9642948989a7499dff 100644 (file)
--- a/lib/Analysis/AliasAnalysis.cpp
+++ b/lib/Analysis/AliasAnalysis.cpp
@@ -1,10 +1,10 @@
 //===- AliasAnalysis.cpp - Generic Alias Analysis Interface Implementation -==//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 // This file implements the generic AliasAnalysis interface which is used as the
@@ -25,16 +25,18 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/Pass.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Instructions.h"
+#include "llvm/Type.h"
 #include "llvm/Target/TargetData.h"
-#include <iostream>
 using namespace llvm;
 
 // Register the AliasAnalysis interface, providing a nice name to refer to.
 namespace {
   RegisterAnalysisGroup<AliasAnalysis> Z("Alias Analysis");
 }
+char AliasAnalysis::ID = 0;
 
 //===----------------------------------------------------------------------===//
 // Default chaining methods
@@ -57,14 +59,11 @@ bool AliasAnalysis::pointsToConstantMemory(const Value *P) {
   return AA->pointsToConstantMemory(P);
 }
 
-bool AliasAnalysis::doesNotAccessMemory(Function *F) {
-  assert(AA && "AA didn't call InitializeAliasAnalysis in its run method!");
-  return AA->doesNotAccessMemory(F);
-}
-
-bool AliasAnalysis::onlyReadsMemory(Function *F) {
+AliasAnalysis::ModRefBehavior
+AliasAnalysis::getModRefBehavior(Function *F, CallSite CS,
+                                 std::vector<PointerAccessInfo> *Info) {
   assert(AA && "AA didn't call InitializeAliasAnalysis in its run method!");
-  return doesNotAccessMemory(F) || AA->onlyReadsMemory(F);
+  return AA->getModRefBehavior(F, CS, Info);
 }
 
 bool AliasAnalysis::hasNoModRefInfoForCalls() const {
@@ -116,18 +115,20 @@ AliasAnalysis::getModRefInfo(StoreInst *S, Value *P, unsigned Size) {
 AliasAnalysis::ModRefResult
 AliasAnalysis::getModRefInfo(CallSite CS, Value *P, unsigned Size) {
   ModRefResult Mask = ModRef;
-  if (Function *F = CS.getCalledFunction())
-    if (onlyReadsMemory(F)) {
-      if (doesNotAccessMemory(F)) return NoModRef;
+  if (Function *F = CS.getCalledFunction()) {
+    ModRefBehavior MRB = getModRefBehavior(F, CallSite());
+    if (MRB == OnlyReadsMemory)
       Mask = Ref;
-    }
+    else if (MRB == DoesNotAccessMemory)
+      return NoModRef;
+  }
 
   if (!AA) return Mask;
 
   // If P points to a constant memory location, the call definitely could not
   // modify the memory location.
   if ((Mask & Mod) && AA->pointsToConstantMemory(P))
-    Mask = Ref;
+    Mask = ModRefResult(Mask & ~Mod);
 
   return ModRefResult(Mask & AA->getModRefInfo(CS, P, Size));
 }
@@ -187,6 +188,4 @@ bool AliasAnalysis::canInstructionRangeModify(const Instruction &I1,
 // be pulled in if the AliasAnalysis classes are pulled in.  Otherwise we run
 // the risk of AliasAnalysis being used, but the default implementation not
 // being linked into the tool that uses it.
-//
-extern void llvm::BasicAAStub();
-static IncludeFile INCLUDE_BASICAA_CPP((void*)&BasicAAStub);
+DEFINING_FILE_FOR(AliasAnalysis)