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

Backed out 1 changesets (bug 1776668) for causing bug 1780426, a=backout

Browse Source 
Backed out changeset f3cd67fc1a50 (bug 1776668)
This commit is contained in:
Dianna Smith
2022-07-26 14:30:18 -04:00
parent 816032d182
commit 790070fcf5
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
dom/script/ScriptLoader.cpp
View File

@@ -2006,19 +2006,22 @@ nsresult ScriptLoader::FillCompileOptionsForRequest(
aOptions->allocateInstantiationStorage = true;
// Checker whether a delazification strategy is requested from the preference
// in about:config, and allow to switch to it if we have not yet overflowed
// our document's quota of scripts to be parsed with a non-default strategy.
//
// Otherwise, the default is set either by the CompileOptions default field
// value or by the CompileOptions constructor which checks whether code
// coverage is enabled.
if (ShouldApplyDelazifyStrategy(aRequest, aOptions)) {
ApplyDelazifyStrategy(aOptions);
if (aOptions->forceFullParse()) {
// If code coverage is enabled, full-parsing is non revertable and asserts
// if any attempt to do so is made. Thus we should skip attempts to apply a
// different delazification strategy.
} else if (ShouldApplyDelazifyStrategy(aRequest)) {
ApplyDelazifyStrategy(aRequest, aOptions);
mTotalFullParseSize +=
aRequest->ScriptTextLength() > 0
? static_cast<uint32_t>(aRequest->ScriptTextLength())
: 0;
} else {
// If we cannot apply the delazification strategy set in the preference, due
// to failure of the preconditions, then we default to the strategy which
// minimize the memory impact at runtime.
aOptions->setEagerDelazificationStrategy(
JS::DelazificationOption::OnDemandOnly);
}
return NS_OK;
@@ -3253,15 +3256,8 @@ static bool IsInternalURIScheme(nsIURI* uri) {
uri->SchemeIs("chrome");
}
bool ScriptLoader::ShouldApplyDelazifyStrategy(ScriptLoadRequest* aRequest,
JS::CompileOptions* aOptions) {
if (aOptions->forceFullParse()) {
// If code coverage is enabled, full-parsing is non revertable and asserts
// if any attempt to do so is made. Thus we should skip attempts to apply a
// different delazification strategy.
return false;
}
bool ScriptLoader::ShouldApplyDelazifyStrategy(ScriptLoadRequest* aRequest) {
// Full parse everything if negative.
if (!aRequest->IsTextSource()) {
// Delazification strategy is only used while processing source input, as
// the bytecode cache already contains delazified functions.
@@ -3274,13 +3270,6 @@ bool ScriptLoader::ShouldApplyDelazifyStrategy(ScriptLoadRequest* aRequest,
return false;
}
if (aRequest->HasScriptLoadContext() &&
aRequest->GetScriptLoadContext()->mIsInline) {
// For inline script, we use the strategy defined in CompileOptions
// constructor, or its default value.
return false;
}
auto logEnabled = MakeScopeExit([&] {
LOG(
("ScriptLoadRequest (%p): non-on-demand-only Parsing Enabled for "
@@ -3323,7 +3312,8 @@ bool ScriptLoader::ShouldApplyDelazifyStrategy(ScriptLoadRequest* aRequest,
return false;
}
void ScriptLoader::ApplyDelazifyStrategy(JS::CompileOptions* aOptions) {
void ScriptLoader::ApplyDelazifyStrategy(ScriptLoadRequest* aRequest,
JS::CompileOptions* aOptions) {
JS::DelazificationOption strategy =
JS::DelazificationOption::ParseEverythingEagerly;
uint32_t strategyIndex =
@@ -3352,6 +3342,17 @@ void ScriptLoader::ApplyDelazifyStrategy(JS::CompileOptions* aOptions) {
strategy = JS::DelazificationOption(uint8_t(strategyIndex));
}
// When using inline script, we want to minimize time spent parsing before
// running the script and thus forbid choosing the eager delazification
// strategy. It might still be selected by others means such as through code
// coverage.
if (aRequest->HasScriptLoadContext() &&
aRequest->GetScriptLoadContext()->mIsInline) {
if (strategy == JS::DelazificationOption::ParseEverythingEagerly) {
strategy = JS::DelazificationOption::OnDemandOnly;
}
}
aOptions->setEagerDelazificationStrategy(strategy);
}