Clean up assume intrinsic pattern matching, no need to check that the argument is...

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

diff --git a/lib/Analysis/AssumptionTracker.cpp b/lib/Analysis/AssumptionTracker.cpp
index b62f17b015ccd63e86a3d1a32f2b6684548d09d3..775ce1ddc84cb35ee2a41dddba05ed1a10c415e3 100644 (file)
--- a/lib/Analysis/AssumptionTracker.cpp
+++ b/lib/Analysis/AssumptionTracker.cpp
@@ -46,10 +46,8 @@ void AssumptionTracker::CallCallbackVH::deleted() {
 
 AssumptionTracker::FunctionCallsMap::iterator
 AssumptionTracker::scanFunction(Function *F) {
-  auto IP =
-    CachedAssumeCalls.insert(std::make_pair(FunctionCallbackVH(F, this),
-                                            std::unique_ptr<CallHandleSet>(
-                                              new CallHandleSet())));
+  auto IP = CachedAssumeCalls.insert(std::make_pair(
+      FunctionCallbackVH(F, this), llvm::make_unique<CallHandleSet>()));
   assert(IP.second && "Scanning function already in the map?");
 
   FunctionCallsMap::iterator I = IP.first;
@@ -58,7 +56,7 @@ AssumptionTracker::scanFunction(Function *F) {
   // to our cache.
   for (BasicBlock &B : *F)
     for (Instruction &II : B)
-      if (match(cast<Value>(&II), m_Intrinsic<Intrinsic::assume>(m_Value())))
+      if (match(&II, m_Intrinsic<Intrinsic::assume>()))
         I->second->insert(CallCallbackVH(&II, this));
 
   return I;
@@ -69,10 +67,8 @@ void AssumptionTracker::verifyAnalysis() const {
   for (const auto &I : CachedAssumeCalls) {
     for (const BasicBlock &B : cast<Function>(*I.first))
       for (const Instruction &II : B) {
-        Instruction *C = const_cast<Instruction*>(&II);
-        if (match(C, m_Intrinsic<Intrinsic::assume>(m_Value()))) {
-          assert(I.second->count(CallCallbackVH(C,
-                   const_cast<AssumptionTracker*>(this))) &&
+        if (match(&II, m_Intrinsic<Intrinsic::assume>())) {
+          assert(I.second->find_as(&II) != I.second->end() &&
                  "Assumption in scanned function not in cache");
         }
     }
@@ -81,8 +77,7 @@ void AssumptionTracker::verifyAnalysis() const {
 }
 
 void AssumptionTracker::registerAssumption(CallInst *CI) {
-  assert(match(cast<Value>(CI),
-               m_Intrinsic<Intrinsic::assume>(m_Value())) &&
+  assert(match(CI, m_Intrinsic<Intrinsic::assume>()) &&
          "Registered call does not call @llvm.assume");
   assert(CI->getParent() &&
          "Cannot register @llvm.assume call not in a basic block");