This resolves a regression of BasicAA which failed to find any memory information for overloaded intrinsics (PR1600). This resolves that issue, and improves the matching scheme to use a BitVector rather than a binary search.

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

1 files changed, 23 insertions, 4 deletions

diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index a1bf69e..c4aa3b5 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -21,10 +21,12 @@
 #include "llvm/ParameterAttributes.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/Instructions.h"
+#include "llvm/Intrinsics.h"
 #include "llvm/Pass.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/BitVector.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/ManagedStatic.h"
@@ -874,6 +876,9 @@ static const char *OnlyReadsMemoryFns[] = {
 static ManagedStatic<std::vector<const char*> > NoMemoryTable;
 static ManagedStatic<std::vector<const char*> > OnlyReadsMemoryTable;
 
+static ManagedStatic<BitVector> NoMemoryIntrinsics;
+static ManagedStatic<BitVector> OnlyReadsMemoryIntrinsics;
+
 
 AliasAnalysis::ModRefBehavior
 BasicAliasAnalysis::getModRefBehavior(Function *F, CallSite CS,
@@ -891,16 +896,30 @@ BasicAliasAnalysis::getModRefBehavior(Function *F, CallSite CS,
                                 OnlyReadsMemoryFns, 
                                 OnlyReadsMemoryFns+
                       sizeof(OnlyReadsMemoryFns)/sizeof(OnlyReadsMemoryFns[0]));
-#define GET_MODREF_BEHAVIOR
-#include "llvm/Intrinsics.gen"
-#undef GET_MODREF_BEHAVIOR
-    
+
     // Sort the table the first time through.
     std::sort(NoMemoryTable->begin(), NoMemoryTable->end(), StringCompare());
     std::sort(OnlyReadsMemoryTable->begin(), OnlyReadsMemoryTable->end(),
               StringCompare());
+    
+    NoMemoryIntrinsics->resize(Intrinsic::num_intrinsics);
+    OnlyReadsMemoryIntrinsics->resize(Intrinsic::num_intrinsics);
+#define GET_MODREF_BEHAVIOR
+#include "llvm/Intrinsics.gen"
+#undef GET_MODREF_BEHAVIOR
+    
     Initialized = true;
   }
+
+  // If this is an intrinsic, we can use lookup tables
+  if (unsigned id = F->getIntrinsicID()) {
+    if (NoMemoryIntrinsics->test(id))
+      return DoesNotAccessMemory;
+    if (OnlyReadsMemoryIntrinsics->test(id))
+      return OnlyReadsMemory;
+
+    return UnknownModRefBehavior;
+  }
   
   ValueName *Name = F->getValueName();
   unsigned NameLen = Name->getKeyLength();