From 090ac0865a09ff592ec1b36f41f3273d55f98f95 Mon Sep 17 00:00:00 2001
From: Evan Cheng <evan.cheng@apple.com>
Date: Thu, 17 Dec 2009 09:39:49 +0000
Subject: Revert 91280-91283, 91286-91289, 91291, 91293, 91295-91296. It
 apparently introduced a non-deterministic behavior in the optimizer
 somewhere.

llvm-svn: 91598
---
 llvm/lib/Analysis/IVUsers.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'llvm/lib/Analysis/IVUsers.cpp')

diff --git a/llvm/lib/Analysis/IVUsers.cpp b/llvm/lib/Analysis/IVUsers.cpp
index 627dbbb3288..37747b65174 100644
--- a/llvm/lib/Analysis/IVUsers.cpp
+++ b/llvm/lib/Analysis/IVUsers.cpp
@@ -53,7 +53,7 @@ static bool containsAddRecFromDifferentLoop(const SCEV *S, Loop *L) {
       if (newLoop == L)
         return false;
       // if newLoop is an outer loop of L, this is OK.
-      if (newLoop->contains(L->getHeader()))
+      if (!LoopInfo::isNotAlreadyContainedIn(L, newLoop))
         return false;
     }
     return true;
@@ -307,7 +307,6 @@ bool IVUsers::runOnLoop(Loop *l, LPPassManager &LPM) {
   for (BasicBlock::iterator I = L->getHeader()->begin(); isa<PHINode>(I); ++I)
     AddUsersIfInteresting(I);
 
-  Processed.clear();
   return false;
 }
 
@@ -370,7 +369,7 @@ void IVUsers::dump() const {
 void IVUsers::releaseMemory() {
   IVUsesByStride.clear();
   StrideOrder.clear();
-  IVUses.clear();
+  Processed.clear();
 }
 
 void IVStrideUse::deleted() {
-- 
cgit v1.2.3