Skip to content

Commit 9b4b2e4

Browse files
fix(javascript): keep a conditional whose test reads a global twice
A global may be a getter answering each read differently, so `x ? y : x` stays as it is when `x` is one; restore the corpora entries that relied on it. Claude-Session: https://claude.ai/code/session_01ViD41i2KdwwGxrDk7yrjeD
1 parent cf23f8f commit 9b4b2e4

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎lib/javascript/syntax-printer.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16942,7 +16942,9 @@ const installImprove = (modules) => {
1694216942
if (
1694316943
A.isSymbolRefNode(test) &&
1694416944
A.isSymbolRefNode(alternate) &&
16945-
test.definition === alternate.definition
16945+
test.definition === alternate.definition &&
16946+
// A global may be a getter, answering each read differently.
16947+
readsAlike(test, compressor)
1694616948
) {
1694716949
return makeNode(A.BinaryNode, optimized, {
1694816950
operator: "&&",

‎test/helpers/oxcSmaller.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ const OXC_SMALLER_BY_REASON = [
6161
"oxc minifier: peephole/esbuild.rs:287",
6262
"oxc minifier: peephole/esbuild.rs:288",
6363
"oxc minifier: peephole/esbuild.rs:494",
64+
"oxc minifier: peephole/esbuild.rs:520",
6465
"oxc minifier: peephole/esbuild.rs:596",
66+
"oxc minifier: peephole/esbuild.rs:598",
6567
"oxc minifier: peephole/esbuild.rs:599",
6668
"oxc minifier: peephole/esbuild.rs:600",
6769
"oxc minifier: peephole/esbuild.rs:628",
@@ -1283,12 +1285,14 @@ const OXC_SMALLER_BY_REASON = [
12831285
[
12841286
"oxc writes conditional expressions shorter, as oxc's `peephole/minimize_conditional_expression.rs` tests show",
12851287
[
1288+
"oxc minifier: peephole/minimize_conditional_expression.rs:104",
12861289
"oxc minifier: peephole/minimize_conditional_expression.rs:112",
12871290
"oxc minifier: peephole/minimize_conditional_expression.rs:115",
12881291
"oxc minifier: peephole/minimize_conditional_expression.rs:121",
12891292
"oxc minifier: peephole/minimize_conditional_expression.rs:122",
12901293
"oxc minifier: peephole/minimize_conditional_expression.rs:181",
12911294
"oxc minifier: peephole/minimize_conditional_expression.rs:182",
1295+
"oxc minifier: peephole/minimize_conditional_expression.rs:44",
12921296
"oxc minifier: peephole/minimize_conditional_expression.rs:55",
12931297
"oxc minifier: peephole/minimize_conditional_expression.rs:72",
12941298
"oxc minifier: peephole/minimize_conditional_expression.rs:73",

‎test/unitCases/syntax-printer.unittest.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ const IMPROVED_CASES = [
577577
// of its function's own, or the call passes, keeps or constructs something.
578578
/** @type {[string, string][]} */
579579
const KEPT_CASES = [
580+
["a conditional whose other branch reads a global getter again", 'var n = 0; Object.defineProperty(globalThis, "g", { get: function () { return n++; }, configurable: true }); function f(b) { return g ? b : g; } console.log(f(1), f(2));'],
580581
["a conditional whose other branch reads a getter twice or a different binding", "var n = 0, o = { get x() { return ++n; } }; function f(b) { var a = 1; { let a = 0; var r = a ? b : o.x ? b : o.x; } return [r, a, n]; } console.log(f(2));"],
581582
["a bigint and a number concatenated, which throws", "try { console.log(1n + 2); } catch (e) { console.log(e.name); }"],
582583
["an array literal joining to a string longer than it", 'console.log([!0, !0, !0] + "");'],

0 commit comments

Comments
 (0)