Backed out 17 changesets (bug 1744178, bug 1734098) for causing leaks. CLOSED TREE
Backed out changeset 08070838c7d2 (bug 1734098) Backed out changeset cfdf7ed9a5a2 (bug 1734098) Backed out changeset 02d7ca7fc45c (bug 1734098) Backed out changeset 7b7c59fc644b (bug 1734098) Backed out changeset 630055366dac (bug 1734098) Backed out changeset da83b4571cf2 (bug 1734098) Backed out changeset 323af9d3e0e1 (bug 1734098) Backed out changeset cf458ad5345a (bug 1734098) Backed out changeset a85846f79eb5 (bug 1734098) Backed out changeset 0d07931e6bc8 (bug 1734098) Backed out changeset ffd72fa3fc59 (bug 1734098) Backed out changeset 3174f1ecfd03 (bug 1734098) Backed out changeset cfb19671fd4e (bug 1734098) Backed out changeset c3b9c8221059 (bug 1734098) Backed out changeset 532328aedaaa (bug 1734098) Backed out changeset 48aa5ca15135 (bug 1734098) Backed out changeset 6ca5bceb693c (bug 1744178)
This commit is contained in:
@@ -1840,8 +1840,7 @@ nsresult ScriptLoader::AttemptAsyncScriptCompile(ScriptLoadRequest* aRequest,
|
||||
|
||||
size_t length =
|
||||
aRequest->mScriptBytecode.length() - aRequest->mBytecodeOffset;
|
||||
JS::DecodeOptions decodeOptions(options);
|
||||
if (!JS::CanDecodeOffThread(cx, decodeOptions, length)) {
|
||||
if (!JS::CanDecodeOffThread(cx, options, length)) {
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
@@ -1868,19 +1867,18 @@ nsresult ScriptLoader::AttemptAsyncScriptCompile(ScriptLoadRequest* aRequest,
|
||||
|
||||
aRequest->mOffThreadToken =
|
||||
maybeSource.constructed<SourceText<char16_t>>()
|
||||
? JS::CompileModuleToStencilOffThread(
|
||||
? JS::CompileOffThreadModule(
|
||||
cx, options, maybeSource.ref<SourceText<char16_t>>(),
|
||||
OffThreadScriptLoaderCallback, static_cast<void*>(runnable))
|
||||
: JS::CompileModuleToStencilOffThread(
|
||||
: JS::CompileOffThreadModule(
|
||||
cx, options, maybeSource.ref<SourceText<Utf8Unit>>(),
|
||||
OffThreadScriptLoaderCallback, static_cast<void*>(runnable));
|
||||
if (!aRequest->mOffThreadToken) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
} else if (aRequest->IsBytecode()) {
|
||||
JS::DecodeOptions decodeOptions(options);
|
||||
aRequest->mOffThreadToken = JS::DecodeStencilOffThread(
|
||||
cx, decodeOptions, aRequest->mScriptBytecode, aRequest->mBytecodeOffset,
|
||||
aRequest->mOffThreadToken = JS::DecodeOffThreadScript(
|
||||
cx, options, aRequest->mScriptBytecode, aRequest->mBytecodeOffset,
|
||||
OffThreadScriptLoaderCallback, static_cast<void*>(runnable));
|
||||
if (!aRequest->mOffThreadToken) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
@@ -1908,10 +1906,10 @@ nsresult ScriptLoader::AttemptAsyncScriptCompile(ScriptLoadRequest* aRequest,
|
||||
|
||||
aRequest->mOffThreadToken =
|
||||
maybeSource.constructed<SourceText<char16_t>>()
|
||||
? JS::CompileToStencilOffThread(
|
||||
? JS::CompileOffThread(
|
||||
cx, options, maybeSource.ref<SourceText<char16_t>>(),
|
||||
OffThreadScriptLoaderCallback, static_cast<void*>(runnable))
|
||||
: JS::CompileToStencilOffThread(
|
||||
: JS::CompileOffThread(
|
||||
cx, options, maybeSource.ref<SourceText<Utf8Unit>>(),
|
||||
OffThreadScriptLoaderCallback, static_cast<void*>(runnable));
|
||||
if (!aRequest->mOffThreadToken) {
|
||||
@@ -2182,8 +2180,6 @@ nsresult ScriptLoader::FillCompileOptionsForRequest(
|
||||
|
||||
aOptions->borrowBuffer = true;
|
||||
|
||||
aOptions->allocateInstantiationStorage = true;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user