corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1724236 - Inline JoinOffThread r=arai

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D218456
This commit is contained in:
Bryan Thrall
2024-10-30 13:41:46 +00:00
parent a85ba25a1c
commit 34372a7a97
3 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/base/JSExecutionContext.cpp
View File

@@ -83,18 +83,6 @@ JSExecutionContext::JSExecutionContext(
namespace mozilla::dom {
void JoinOffThread(JSContext* aCx, JS::CompileOptions& aCompileOptions,
ScriptLoadContext* aContext, RefPtr<JS::Stencil>& aStencil,
JS::InstantiationStorage& aStorage, ErrorResult& aRv) {
MOZ_ASSERT(aCompileOptions.noScriptRval);
aStencil = aContext->StealOffThreadResult(aCx, &aStorage);
if (!aStencil) {
aRv.NoteJSContextException(aCx);
return;
}
}
void Compile(JSContext* aCx, JS::CompileOptions& aCompileOptions,
const nsAString& aScript, RefPtr<JS::Stencil>& aStencil,
ErrorResult& aRv) {

7
dom/base/JSExecutionContext.h
View File

@@ -64,13 +64,6 @@ class MOZ_STACK_CLASS JSExecutionContext final {
}
};
// After getting a notification that an off-thread compile/decode finished,
// this function will take the result of the off-thread operation and move it
// to the main thread.
void JoinOffThread(JSContext* aCx, JS::CompileOptions& aCompileOptions,
ScriptLoadContext* aContext, RefPtr<JS::Stencil>& aStencil,
JS::InstantiationStorage& aStorage, ErrorResult& aRv);
// Compile a script contained in a string.
void Compile(JSContext* aCx, JS::CompileOptions& aCompileOptions,
const nsAString& aScript, RefPtr<JS::Stencil>& aStencil,

42
dom/script/ScriptLoader.cpp
View File

@@ -2758,8 +2758,13 @@ void ScriptLoader::InstantiateClassicScriptFromMaybeEncodedSource(
aRequest));
RefPtr<JS::Stencil> stencil;
JS::InstantiationStorage storage;
JoinOffThread(aCx, aCompileOptions, aRequest->GetScriptLoadContext(),
stencil, storage, aRv);
MOZ_ASSERT(aCompileOptions.noScriptRval);
stencil =
aRequest->GetScriptLoadContext()->StealOffThreadResult(aCx, &storage);
if (!stencil) {
aRv.NoteJSContextException(aCx);
return;
}
if (!aRv.Failed() && aKeepStencil) {
aStencilDup = JS::DuplicateStencil(aCx, stencil.get());
if (!aStencilDup) {
@@ -2767,12 +2772,11 @@ void ScriptLoader::InstantiateClassicScriptFromMaybeEncodedSource(
return;
}
}
if (stencil) {
bool unused;
InstantiateStencil(aCx, aCompileOptions, std::move(stencil), aScript,
unused, aDebuggerPrivateValue,
aDebuggerIntroductionScript, aRv, false, &storage);
}
bool unused;
InstantiateStencil(aCx, aCompileOptions, std::move(stencil), aScript,
unused, aDebuggerPrivateValue,
aDebuggerIntroductionScript, aRv, false, &storage);
} else {
LOG(("ScriptLoadRequest (%p): Decode Bytecode and Execute", aRequest));
AUTO_PROFILER_MARKER_TEXT("BytecodeDecodeMainThread", JS,
@@ -2816,8 +2820,13 @@ void ScriptLoader::InstantiateClassicScriptFromMaybeEncodedSource(
MOZ_ASSERT(aRequest->IsTextSource());
RefPtr<JS::Stencil> stencil;
JS::InstantiationStorage storage;
JoinOffThread(aCx, aCompileOptions, aRequest->GetScriptLoadContext(),
stencil, storage, aRv);
MOZ_ASSERT(aCompileOptions.noScriptRval);
stencil =
aRequest->GetScriptLoadContext()->StealOffThreadResult(aCx, &storage);
if (!stencil) {
aRv.NoteJSContextException(aCx);
return;
}
if (!aRv.Failed() && aKeepStencil) {
aStencilDup = JS::DuplicateStencil(aCx, stencil.get());
if (!aStencilDup) {
@@ -2825,13 +2834,12 @@ void ScriptLoader::InstantiateClassicScriptFromMaybeEncodedSource(
return;
}
}
if (stencil) {
bool unused;
InstantiateStencil(aCx, aCompileOptions, std::move(stencil), aScript,
unused, aDebuggerPrivateValue,
aDebuggerIntroductionScript, aRv, encodeBytecode,
&storage);
}
bool unused;
InstantiateStencil(aCx, aCompileOptions, std::move(stencil), aScript,
unused, aDebuggerPrivateValue,
aDebuggerIntroductionScript, aRv, encodeBytecode,
&storage);
} else {
// Main thread parsing (inline and small scripts)
LOG(("ScriptLoadRequest (%p): Compile And Exec", aRequest));