AssumptionTracker: Don't create temporary CallbackVHs.

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

diff --git a/lib/Analysis/AssumptionTracker.cpp b/lib/Analysis/AssumptionTracker.cpp
index 3441030e49e96e2247a83229b63f06019ca8e8fb..b62f17b015ccd63e86a3d1a32f2b6684548d09d3 100644 (file)
--- a/lib/Analysis/AssumptionTracker.cpp
+++ b/lib/Analysis/AssumptionTracker.cpp
@@ -29,12 +29,14 @@ void AssumptionTracker::FunctionCallbackVH::deleted() {
 }
 
 void AssumptionTracker::forgetCachedAssumptions(Function *F) {
-  CachedAssumeCalls.erase(F);
+  auto I = CachedAssumeCalls.find_as(F);
+  if (I != CachedAssumeCalls.end())
+    CachedAssumeCalls.erase(I);
 }
 
 void AssumptionTracker::CallCallbackVH::deleted() {
   assert(F && "delete callback called on dummy handle");
-  FunctionCallsMap::iterator I = AT->CachedAssumeCalls.find(F);
+  FunctionCallsMap::iterator I = AT->CachedAssumeCalls.find_as(F);
   assert(I != AT->CachedAssumeCalls.end() &&
          "Function cleared from the map without removing the values?");
 
@@ -88,7 +90,7 @@ void AssumptionTracker::registerAssumption(CallInst *CI) {
   Function *F = CI->getParent()->getParent();
   assert(F && "Cannot register @llvm.assume call not in a function");
 
-  FunctionCallsMap::iterator I = CachedAssumeCalls.find(F);
+  FunctionCallsMap::iterator I = CachedAssumeCalls.find_as(F);
   if (I == CachedAssumeCalls.end()) {
     // If this function has not already been scanned, then don't do anything
     // here. This intrinsic will be found, if it still exists, if the list of