Skip to content

Commit 27426fd

Browse files
fix(minify): resolve no callee or global write where the program reads eval
An `eval` may write any binding unseen, as swc's `issue_11684_nested_eval_preserves_constructor_arguments` does. Retire the twelve terser cases the trimmed arguments closed. Claude-Session: https://claude.ai/code/session_01ViD41i2KdwwGxrDk7yrjeD
1 parent 627b6c9 commit 27426fd

4 files changed

Lines changed: 22 additions & 27 deletions

File tree

‎lib/javascript/syntax-printer.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23574,10 +23574,12 @@ const installImprove = (modules) => {
2357423574
*/
2357523575
const readsUnassignedGlobal = (node, compressor) =>
2357623576
isUndeclaredRef(node) &&
23577-
// Without `reduce_vars` counting writes, the probe's own find them.
23578-
(!compressor.option("reduce_vars") ||
23579-
(node.definition.assignments === 0 &&
23580-
node.definition.patternWrites === 0)) &&
23577+
// Without `reduce_vars` counting writes, the probe's own find them,
23578+
// all but what an `eval` writes.
23579+
(!compressor.option("reduce_vars")
23580+
? !programReadsEval
23581+
: node.definition.assignments === 0 &&
23582+
node.definition.patternWrites === 0) &&
2358123583
!isReboundGlobal(node.name) &&
2358223584
!globalMayBeRebound(compressor);
2358323585

@@ -25507,6 +25509,8 @@ const installImprove = (modules) => {
2550725509
const localFunctions = new Map();
2550825510
/** @type {Set<Node>} */
2550925511
const writtenNames = new Set();
25512+
// An `eval`, direct or not, may write any binding it can see, unseen.
25513+
let programReadsEval = false;
2551025514
/**
2551125515
* The function a call runs where the program defines it: a function written
2551225516
* in place, or one a name declared once, never written again, holds.
@@ -25516,6 +25520,7 @@ const installImprove = (modules) => {
2551625520
const calledFunction = (callee) => {
2551725521
if (A.isLambdaNode(callee)) return callee;
2551825522
if (
25523+
programReadsEval ||
2551925524
!A.isSymbolRefNode(callee) ||
2552025525
!callee.definition ||
2552125526
isUndeclaredRef(callee) ||
@@ -25564,6 +25569,7 @@ const installImprove = (modules) => {
2556425569
parameterAliases.clear();
2556525570
localFunctions.clear();
2556625571
writtenNames.clear();
25572+
programReadsEval = false;
2556725573
if (improvements.enabled) {
2556825574
let depth = 0;
2556925575
/** @type {{ call: Node, argument: Node, name: string }[]} */
@@ -25621,6 +25627,13 @@ const installImprove = (modules) => {
2562125627
handOff(node, "globalThis");
2562225628
}
2562325629
}
25630+
if (
25631+
A.isSymbolRefNode(node) &&
25632+
node.name === "eval" &&
25633+
isUndeclaredRef(node)
25634+
) {
25635+
programReadsEval = true;
25636+
}
2562425637
if ((A.isDefunNode(node) || A.isDefClassNode(node)) && node.id) {
2562525638
localFunctions.set(node.id.definition.identifiers[0], node);
2562625639
} else if (

‎test/helpers/swcSmaller.js‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const SWC_SMALLER_BY_REASON = [
1414
"swc minifier: fixture/issues/11084/input.js",
1515
"swc minifier: fixture/issues/11368/input.js",
1616
"swc minifier: fixture/issues/11684/identifier-aliases/input.js",
17-
"swc minifier: fixture/issues/11684/scopes-and-mutations/input.js",
1817
"swc minifier: fixture/issues/12187/input.js",
1918
"swc minifier: fixture/issues/12188/input.js",
2019
"swc minifier: fixture/issues/12282/call/input.js",
@@ -144,21 +143,14 @@ const SWC_SMALLER_BY_REASON = [
144143
"swc minifier: fixture/issues/11512-exhaustive/iife-anon-default-unused/input.js",
145144
"swc minifier: fixture/issues/11684/identifier-reduce-vars-only/input.js",
146145
"swc minifier: fixture/issues/4234/input.js",
147-
"terser compress: array-constructor/array_constructor",
148146
"terser compress: collapse_vars/collapse_vars_repeated",
149147
"terser compress: collapse_vars/collapse_vars_self_reference",
150-
"terser compress: collapse_vars/issue_1605_1",
151148
"terser compress: collapse_vars/issue_1631_3",
152-
"terser compress: collapse_vars/issue_2954_2",
153-
"terser compress: collapse_vars/issue_2954_3",
154149
"terser compress: conditionals/cond_8c",
155150
"terser compress: conditionals/no_evaluate",
156151
"terser compress: defaults/defaults_false",
157152
"terser compress: defaults/defaults_true_conditionals_false",
158153
"terser compress: defaults/defaults_true_evaluate_false",
159-
"terser compress: destructuring/unused_destructuring_decl_2",
160-
"terser compress: destructuring/unused_destructuring_decl_4",
161-
"terser compress: destructuring/unused_destructuring_decl_5",
162154
"terser compress: evaluate/Infinity_NaN_undefined_LHS",
163155
"terser compress: evaluate/pow_sequence_with_parens_exact",
164156
"terser compress: export/export_default_seq",
@@ -200,7 +192,6 @@ const SWC_SMALLER_BY_REASON = [
200192
"terser compress: numbers/hex_numbers_in_parentheses_for_prototype_functions",
201193
"terser compress: object/computed_property_names",
202194
"terser compress: parameters/default_arguments",
203-
"terser compress: pure_funcs/babel",
204195
"terser compress: reduce_vars/duplicate_lambda_defun_name_1",
205196
"terser compress: reduce_vars/iife_assign",
206197
"terser compress: reduce_vars/inner_var_for_in_1",
@@ -228,7 +219,6 @@ const SWC_SMALLER_BY_REASON = [
228219
"terser compress: reduce_vars/var_assign_5",
229220
"terser compress: sequences/iife",
230221
"terser compress: sequences/issue_1758",
231-
"terser compress: sequences/make_sequences_3",
232222
"terser compress: sequences/negate_iife_for",
233223
"terser compress: sequences/unsafe_undefined",
234224
"terser compress: switch/if_else7",
@@ -239,8 +229,7 @@ const SWC_SMALLER_BY_REASON = [
239229
"terser compress: template-string/template_strings_ascii_only",
240230
"terser compress: transform/if_else_empty",
241231
"terser compress: try-catch/catch_destructuring_with_sequence",
242-
"terser compress: typeof/issue_2728_4",
243-
"terser compress: unicode/issue_2569"
232+
"terser compress: typeof/issue_2728_4"
244233
]
245234
],
246235
[
@@ -447,13 +436,6 @@ const SWC_SMALLER_BY_REASON = [
447436
"terser compress: typeof/issue_2728_3"
448437
]
449438
],
450-
[
451-
"swc drops call and `new` arguments past the parameters of a callee it can see, and an unused parameter whose default is pure",
452-
[
453-
"terser compress: collapse_vars/issue_2436_12",
454-
"terser compress: export/issue_2131"
455-
]
456-
],
457439
[
458440
"swc merges imports of one module, drops unused specifiers, and folds a declaration into its `export default`",
459441
[

‎test/specCases/minify-corpora.spectest.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,10 +1441,10 @@ const IMPROVED_YET_BIGGER = {
14411441
"4 bytes fewer, 8 more gzipped: `typeof class{}` folded to `\"function\"` breaks the `console.log(typeof` runs",
14421442
"drop-unused/issue_t1447_export_const (a module mangled at its top level)":
14431443
"5 bytes fewer, 6 more gzipped: the exported `const` kept out of its reader, where terser's copy repeats the `console.log(\"PASS\")` gzip matched",
1444+
"array-constructor/array_constructor_unsafe (its own options)":
1445+
"10 bytes fewer, 2 more gzipped: `Array(-0)` written `[]` breaks the `Array(` runs the other calls repeat",
14441446
"fixture/issues/4234/input.js (its own options)":
14451447
"28 bytes fewer, 5 more gzipped: two `RegExp` calls written as literals break the `bar(new RegExp(\"` runs the four calls repeat",
1446-
"fixture/issues/11684/scopes-and-mutations/input.js (its own options)":
1447-
"4 bytes fewer, 4 more gzipped: `new Global(1)` with its unread arguments dropped breaks the `(1,2,3)` runs the other `new`s repeat"
14481448
};
14491449

14501450
// Sources whose shorter spelling no longer repeats text gzip matched, by the
@@ -1748,7 +1748,6 @@ for (const [reason, keys] of /** @type {[string, string[]][]} */ ([
17481748
"evaluate/regexp_property_eval (the default minimizer's options)",
17491749
"fixture/issues/12201/input.js (its own options)",
17501750
"fixture/issues/12201/input.js (the default minimizer's options)",
1751-
"fixture/issues/12214/input.js (the default minimizer's options)",
17521751
"fixture/issues/12298/input.js (the default minimizer's options)",
17531752
"fixture/issues/12299/input.js (its own options)",
17541753
"fixture/issues/4234/input.js (the default minimizer's options)",

‎test/unitCases/javascript/printer.unittest.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9045,7 +9045,8 @@ describe("syntax-printer", () => {
90459045
"function f(...rest) { return 1; } console.log(f(console.log('kept'), 2));",
90469046
"class B { constructor(...a) { this.n = a.length; } } class C extends B {} console.log(new C(1, 2, 3).n);",
90479047
"var f = function (a) { return a; }; f = function (a, b) { return b; }; console.log(f(1, 2));",
9048-
"function f(a) { return a; } console.log(f(1, ...[2, 3]));"
9048+
"function f(a) { return a; } console.log(f(1, ...[2, 3]));",
9049+
'function Outer() {} function Replacement(v) { this.v = v; } function make() { eval("Outer = Replacement"); return new Outer(1); } console.log(make().v);'
90499050
]) {
90509051
const { code } = await minify(input, options);
90519052
expect(runProgram(/** @type {string} */ (code))).toBe(runProgram(input));

0 commit comments

Comments
 (0)