diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp | |
parent | Adding debian version 124.0.1-1. (diff) | |
download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp')
-rw-r--r-- | toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp index c43a322fd4..889f7c96f1 100644 --- a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp +++ b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp @@ -205,7 +205,8 @@ void ThreadStackHelper::CollectJitReturnAddr(void* aAddr) { TryAppendFrame(HangEntryJit()); } -void ThreadStackHelper::CollectWasmFrame(const char* aLabel) { +void ThreadStackHelper::CollectWasmFrame(JS::ProfilingCategoryPair aCategory, + const char* aLabel) { MOZ_RELEASE_ASSERT(mStackToFill); // We don't want to collect WASM frames, as they are probably for content, so // we just add a "(content wasm)" frame. |