--- a/js/src/vm/SavedStacks.cpp
+++ b/js/src/vm/SavedStacks.cpp
@@ -98,27 +98,23 @@ LiveSavedFrameCache::insert(JSContext* c
     }
 
     framePtr.setHasCachedSavedFrame();
 
     return true;
 }
 
 void
-LiveSavedFrameCache::find(JSContext* cx, FrameIter& frameIter, MutableHandleSavedFrame frame) const
+LiveSavedFrameCache::find(JSContext* cx, FramePtr& framePtr, const jsbytecode* pc,
+                          MutableHandleSavedFrame frame) const
 {
     MOZ_ASSERT(initialized());
-    MOZ_ASSERT(!frameIter.done());
 
-    Maybe<FramePtr> maybeFramePtr = getFramePtr(frameIter);
-    MOZ_ASSERT(maybeFramePtr.isSome());
-    MOZ_ASSERT(maybeFramePtr->hasCachedSavedFrame());
-
-    Key key(*maybeFramePtr);
-    const jsbytecode* pc = frameIter.pc();
+    MOZ_ASSERT(framePtr.hasCachedSavedFrame());
+    Key key(framePtr);
     size_t numberStillValid = 0;
 
     frame.set(nullptr);
     for (auto* p = frames->begin(); p < frames->end(); p++) {
         numberStillValid++;
         if (key == p->key && pc == p->pc) {
             frame.set(p->savedFrame);
             break;
@@ -1414,17 +1410,17 @@ SavedStacks::insertFrames(JSContext* cx,
 
         if (parentIsInCache &&
             framePtr &&
             framePtr->hasCachedSavedFrame())
         {
             auto* cache = activation.getLiveSavedFrameCache(cx);
             if (!cache)
                 return false;
-            cache->find(cx, iter, &cachedFrame);
+            cache->find(cx, *framePtr, iter.pc(), &cachedFrame);
             if (cachedFrame)
                 break;
         }
 
         if (capture.is<JS::MaxFrames>())
             capture.as<JS::MaxFrames>().maxFrames--;
     }
 

--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1250,17 +1250,18 @@ class LiveSavedFrameCache
             return false;
         }
         return true;
     }
 
     static mozilla::Maybe<FramePtr> getFramePtr(const FrameIter& iter);
     void trace(JSTracer* trc);
 
-    void find(JSContext* cx, FrameIter& frameIter, MutableHandleSavedFrame frame) const;
+    void find(JSContext* cx, FramePtr& frameptr, const jsbytecode* pc,
+              MutableHandleSavedFrame frame) const;
     bool insert(JSContext* cx, FramePtr& framePtr, const jsbytecode* pc,
                 HandleSavedFrame savedFrame);
 };
 
 static_assert(sizeof(LiveSavedFrameCache) == sizeof(uintptr_t),
               "Every js::Activation has a LiveSavedFrameCache, so we need to be pretty careful "
               "about avoiding bloat. If you're adding members to LiveSavedFrameCache, maybe you "
               "should consider figuring out a way to make js::Activation have a "