wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-30 11:07:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1952 - m-c 1380962/2: Remove unnecessary lambda function in FunctionToString

Browse source
This commit is contained in:
Martok 2022-07-01 12:44:12 +02:00 • committed by roytam1
commit 1e753237e5
2 changed files with 58 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/src/jit-test/tests/basic/bug1380962.js Normal file
View file

@ -0,0 +1,15 @@
// Source string has balanced parentheses even when the source code was discarded.
setDiscardSource(true);
eval("var f = function() { return 0; };");
assertEq(f.toSource(), "(function() {\n [sourceless code]\n})");
// Source string has balanced parentheses even when the source code was discarded.
setDiscardSource(true);
eval("var f = function() { return 0; };");
assertEq(f.toSource(), "(function() {\n [sourceless code]\n})");
// Source string has balanced parentheses even when the source code was discarded.
setDiscardSource(true);
eval("var f = function() { return 0; };");
assertEq(f.toSource(), "(function() {\n [sourceless code]\n})");

114
js/src/jsfun.cpp
View file

@ -978,8 +978,6 @@ js::FunctionToString(JSContext* cx, HandleFunction fun, bool prettyPrint)
} }
} }
bool funIsNonArrowLambda = fun->isLambda() && !fun->isArrow();
// Default class constructors are self-hosted, but have their source // Default class constructors are self-hosted, but have their source
// objects overridden to refer to the span of the class statement or // objects overridden to refer to the span of the class statement or
// expression. Non-default class constructors are never self-hosted. So, // expression. Non-default class constructors are never self-hosted. So,
@ -989,10 +987,7 @@ js::FunctionToString(JSContext* cx, HandleFunction fun, bool prettyPrint)
// If we're not in pretty mode, put parentheses around lambda functions // If we're not in pretty mode, put parentheses around lambda functions
// so that eval returns lambda, not function statement. // so that eval returns lambda, not function statement.
if (haveSource && !prettyPrint && funIsNonArrowLambda) { bool addParentheses = haveSource && !prettyPrint && (fun->isLambda() && !fun->isArrow());
if (!out.append('('))
return nullptr;
}
if (haveSource && !script->scriptSource()->hasSourceData() && if (haveSource && !script->scriptSource()->hasSourceData() &&
!JSScript::loadSource(cx, script->scriptSource(), &haveSource)) !JSScript::loadSource(cx, script->scriptSource(), &haveSource))
@ -1000,34 +995,10 @@ js::FunctionToString(JSContext* cx, HandleFunction fun, bool prettyPrint)
return nullptr; return nullptr;
} }
auto AppendPrelude = [cx, &out, &fun]() { if (addParentheses) {
if (fun->isAsync()) { if (!out.append('('))
if (!out.append("async ")) return nullptr;
return false; }
}
if (!fun->isArrow()) {
if (!out.append("function"))
return false;
if (fun->isStarGenerator()) {
if (!out.append('*'))
return false;
}
}
if (fun->explicitName()) {
if (!out.append(' '))
return false;
if (fun->isBoundFunction() && !fun->hasBoundFunctionNamePrefix()) {
if (!out.append(cx->names().boundWithSpace))
return false;
}
if (!out.append(fun->explicitName()))
return false;
}
return true;
};
if (haveSource) { if (haveSource) {
Rooted<JSFlatString*> src(cx, JSScript::sourceDataForToString(cx, script)); Rooted<JSFlatString*> src(cx, JSScript::sourceDataForToString(cx, script));
@ -1036,36 +1007,61 @@ js::FunctionToString(JSContext* cx, HandleFunction fun, bool prettyPrint)
if (!out.append(src)) if (!out.append(src))
return nullptr; return nullptr;
} else {
if (!prettyPrint && funIsNonArrowLambda) { if (fun->isAsync()) {
if (!out.append(')')) if (!out.append("async "))
return nullptr; return nullptr;
} }
} else if (fun->isInterpreted() &&
(!fun->isSelfHostedBuiltin() ||
fun->infallibleIsDefaultClassConstructor(cx)))
{
// Default class constructors should always haveSource except;
//
// 1. Source has been discarded for the whole compartment.
//
// 2. The source is marked as "lazy", i.e., retrieved on demand, and
// the embedding has not provided a hook to retrieve sources.
MOZ_ASSERT_IF(fun->infallibleIsDefaultClassConstructor(cx),
!cx->runtime()->sourceHook ||
!script->scriptSource()->sourceRetrievable() ||
fun->compartment()->behaviors().discardSource());
if (!AppendPrelude() ||
!out.append("() {\n [sourceless code]\n}"))
{
return nullptr;
}
} else {
if (!AppendPrelude() || if (!fun->isArrow()) {
!out.append("() {\n [native code]\n}")) if (!out.append("function"))
return nullptr;
if (fun->isStarGenerator()) {
if (!out.append('*'))
return nullptr;
}
}
if (fun->explicitName()) {
if (!out.append(' '))
return nullptr;
if (fun->isBoundFunction() && !fun->hasBoundFunctionNamePrefix()) {
if (!out.append(cx->names().boundWithSpace))
return nullptr;
}
if (!out.append(fun->explicitName()))
return nullptr;
}
if (fun->isInterpreted() &&
(!fun->isSelfHostedBuiltin() ||
fun->infallibleIsDefaultClassConstructor(cx)))
{
// Default class constructors should always haveSource except;
//
// 1. Source has been discarded for the whole compartment.
//
// 2. The source is marked as "lazy", i.e., retrieved on demand, and
// the embedding has not provided a hook to retrieve sources.
MOZ_ASSERT_IF(fun->infallibleIsDefaultClassConstructor(cx),
!cx->runtime()->sourceHook ||
!script->scriptSource()->sourceRetrievable() ||
fun->compartment()->behaviors().discardSource());
if (!out.append("() {\n [sourceless code]\n}"))
return nullptr;
} else {
if (!out.append("() {\n [native code]\n}"))
return nullptr;
}
}
if (addParentheses) {
if (!out.append(')'))
return nullptr; return nullptr;
} }
return out.finishString(); return out.finishString();
} }