r113526 introduced an unintended change to the loop unrolling threshold. Revert it.

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

diff --git a/lib/Analysis/TypeBasedAliasAnalysis.cpp b/lib/Analysis/TypeBasedAliasAnalysis.cpp
index cab266b7f1dd53afedd3b09e4d5e4bc0bc1f785e..bbfdcec3f9b4b76ca09d3bdd2ffaa889b59dc688 100644 (file)
--- a/lib/Analysis/TypeBasedAliasAnalysis.cpp
+++ b/lib/Analysis/TypeBasedAliasAnalysis.cpp
@@ -82,14 +82,14 @@ namespace {
                                  public AliasAnalysis {
   public:
     static char ID; // Class identification, replacement for typeinfo
-    TypeBasedAliasAnalysis() : ImmutablePass(&ID) {}
+    TypeBasedAliasAnalysis() : ImmutablePass(ID) {}
 
     /// getAdjustedAnalysisPointer - This method is used when a pass implements
     /// an analysis interface through multiple inheritance.  If needed, it
     /// should override this to adjust the this pointer as needed for the
     /// specified pass info.
-    virtual void *getAdjustedAnalysisPointer(const PassInfo *PI) {
-      if (PI->isPassID(&AliasAnalysis::ID))
+    virtual void *getAdjustedAnalysisPointer(const void *PI) {
+      if (PI == &AliasAnalysis::ID)
         return (AliasAnalysis*)this;
       return this;
     }
@@ -133,7 +133,7 @@ TypeBasedAliasAnalysis::alias(const Value *A, unsigned ASize,
                       ->getMDKindID("tbaa"));
   if (!AM) return MayAlias;
   MDNode *BM =
-    AI->getMetadata(BI->getParent()->getParent()->getParent()
+    BI->getMetadata(BI->getParent()->getParent()->getParent()
                       ->getMDKindID("tbaa"));
   if (!BM) return MayAlias;