diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
tree | 532507288f3defd7f4dcf1af49698bcb76034855 /js/src/vm/JitActivation.h | |
parent | Adding debian version 126.0.1-1. (diff) | |
download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'js/src/vm/JitActivation.h')
-rw-r--r-- | js/src/vm/JitActivation.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/src/vm/JitActivation.h b/js/src/vm/JitActivation.h index be2d63066c..54ca5924d9 100644 --- a/js/src/vm/JitActivation.h +++ b/js/src/vm/JitActivation.h @@ -40,6 +40,8 @@ namespace jit { class BailoutFrameInfo; +enum class IsLeavingFrame { No, Yes }; + // A JitActivation is used for frames running in Baseline or Ion. class JitActivation : public Activation { // If Baseline, Ion or Wasm code is on the stack, and has called into C++, @@ -94,8 +96,6 @@ class JitActivation : public Activation { // purposes. Wasm code can't trap reentrantly. mozilla::Maybe<wasm::TrapData> wasmTrapData_; - void clearRematerializedFrames(); - #ifdef CHECK_OSIPOINT_REGISTERS protected: // Used to verify that live registers don't change between a VM call and @@ -156,8 +156,7 @@ class JitActivation : public Activation { // The inlineDepth must be within bounds of the frame pointed to by iter. RematerializedFrame* getRematerializedFrame( JSContext* cx, const JSJitFrameIter& iter, size_t inlineDepth = 0, - MaybeReadFallback::FallbackConsequence consequence = - MaybeReadFallback::Fallback_Invalidate); + IsLeavingFrame leaving = IsLeavingFrame::No); // Look up a rematerialized frame by the fp. If inlineDepth is out of // bounds of what has been rematerialized, nullptr is returned. |