Bug 1573817: Remove unused parameter from wasm::ProfilingFrameIterator; r=luke
authorBenjamin Bouvier <benj@benj.me>
Wed, 14 Aug 2019 18:54:30 +0000
changeset 488475 6c29bc2d08060ae872e5b5532ee67a69f5a5e23c
parent 488474 85cea8a5afb8131949932fbba97b5542bdc2d54c
child 488476 15048bfaf5ef435586ad0b5591f4c828c6b4d857
push id36444
push userccoroiu@mozilla.com
push dateFri, 16 Aug 2019 16:24:18 +0000
treeherdermozilla-central@8a9e9189cd98 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs1573817
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1573817: Remove unused parameter from wasm::ProfilingFrameIterator; r=luke Differential Revision: https://phabricator.services.mozilla.com/D41968
js/src/vm/Stack.cpp
js/src/wasm/WasmFrameIter.cpp
js/src/wasm/WasmFrameIter.h
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1811,17 +1811,17 @@ void JS::ProfilingFrameIterator::operato
 }
 
 void JS::ProfilingFrameIterator::settleFrames() {
   // Handle transition frames (see comment in JitFrameIter::operator++).
   if (isJSJit() && !jsJitIter().done() &&
       jsJitIter().frameType() == jit::FrameType::WasmToJSJit) {
     wasm::Frame* fp = (wasm::Frame*)jsJitIter().fp();
     iteratorDestroy();
-    new (storage()) wasm::ProfilingFrameIterator(*activation_->asJit(), fp);
+    new (storage()) wasm::ProfilingFrameIterator(fp);
     kind_ = Kind::Wasm;
     MOZ_ASSERT(!wasmIter().done());
     return;
   }
 
   if (isWasm() && wasmIter().done() && wasmIter().unwoundIonCallerFP()) {
     uint8_t* fp = wasmIter().unwoundIonCallerFP();
     iteratorDestroy();
--- a/js/src/wasm/WasmFrameIter.cpp
+++ b/js/src/wasm/WasmFrameIter.cpp
@@ -752,18 +752,17 @@ ProfilingFrameIterator::ProfilingFrameIt
       callerFP_(nullptr),
       callerPC_(nullptr),
       stackAddress_(nullptr),
       unwoundIonCallerFP_(nullptr),
       exitReason_(activation.wasmExitReason()) {
   initFromExitFP(activation.wasmExitFP());
 }
 
-ProfilingFrameIterator::ProfilingFrameIterator(const JitActivation& activation,
-                                               const Frame* fp)
+ProfilingFrameIterator::ProfilingFrameIterator(const Frame* fp)
     : code_(nullptr),
       codeRange_(nullptr),
       callerFP_(nullptr),
       callerPC_(nullptr),
       stackAddress_(nullptr),
       unwoundIonCallerFP_(nullptr),
       exitReason_(ExitReason::Fixed::ImportJit) {
   MOZ_ASSERT(fp);
--- a/js/src/wasm/WasmFrameIter.h
+++ b/js/src/wasm/WasmFrameIter.h
@@ -182,17 +182,17 @@ class ProfilingFrameIterator {
   ProfilingFrameIterator();
 
   // Start unwinding at a non-innermost activation that has necessarily been
   // exited from wasm code (and thus activation.hasWasmExitFP).
   explicit ProfilingFrameIterator(const jit::JitActivation& activation);
 
   // Start unwinding at a group of wasm frames after unwinding an inner group
   // of JSJit frames.
-  ProfilingFrameIterator(const jit::JitActivation& activation, const Frame* fp);
+  explicit ProfilingFrameIterator(const Frame* fp);
 
   // Start unwinding at the innermost activation given the register state when
   // the thread was suspended.
   ProfilingFrameIterator(const jit::JitActivation& activation,
                          const RegisterState& state);
 
   void operator++();
   bool done() const { return !codeRange_ && exitReason_.isNone(); }