diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPerfHintAnalysis.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPerfHintAnalysis.cpp
index 6f8f9ba..d307f81 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPerfHintAnalysis.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPerfHintAnalysis.cpp
@@ -103,7 +103,7 @@
 
   const TargetLowering *TLI;
 
-  AMDGPUPerfHintAnalysis::FuncInfoMap::iterator visit(const Function &F);
+  void visit(const Function &F);
   static bool isMemBound(const AMDGPUPerfHintAnalysis::FuncInfo &F);
   static bool needLimitWave(const AMDGPUPerfHintAnalysis::FuncInfo &F);
 
@@ -211,11 +211,10 @@
   return false;
 }
 
-AMDGPUPerfHintAnalysis::FuncInfoMap::iterator
-AMDGPUPerfHint::visit(const Function &F) {
+void AMDGPUPerfHint::visit(const Function &F) {
   auto FIP = FIM.insert(std::make_pair(&F, AMDGPUPerfHintAnalysis::FuncInfo()));
   if (!FIP.second)
-    return FIP.first;
+    return;
 
   AMDGPUPerfHintAnalysis::FuncInfo &FI = FIP.first->second;
 
@@ -243,7 +242,8 @@
         if (&F == Callee) // Handle immediate recursion
           continue;
 
-        auto Loc = visit(*Callee);
+        visit(*Callee);
+        auto Loc = FIM.find(Callee);
 
         assert(Loc != FIM.end() && "No func info");
         FI.MemInstCount += Loc->second.MemInstCount;
@@ -265,8 +265,6 @@
       }
     }
   }
-
-  return FIP.first;
 }
 
 void AMDGPUPerfHint::runOnFunction(Function &F) {
@@ -277,7 +275,8 @@
   DL = &M.getDataLayout();
   AS = AMDGPU::getAMDGPUAS(M);
 
-  auto Loc = visit(F);
+  visit(F);
+  auto Loc = FIM.find(&F);
 
   assert(Loc != FIM.end() && "No func info");
   LLVM_DEBUG(dbgs() << F.getName() << " MemInst: " << Loc->second.MemInstCount