fix corner case in join_vars (#5832)

fixes #5831
mishoo · Jun 8, 2024 · 3dfb379 · 3dfb379
1 parent 2cb6454
commit 3dfb379
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -4265,8 +4265,17 @@ Compressor.prototype.compress = function(node) {
                 prop = +prop;
                 var len = value.elements.length;
                 if (prop > len + 4) return;
-                while (len < prop) value.elements[len++] = make_node(AST_Hole, value);
-                value.elements[prop] = node.right;
+                if (prop < len) {
+                    var element = value.elements[prop];
+                    if (element instanceof AST_Hole) {
+                        value.elements[prop] = node.right;
+                    } else {
+                        value.elements[prop] = make_sequence(node, [ element, node.right ]).optimize(compressor);
+                    }
+                } else {
+                    while (prop > len) value.elements[len++] = make_node(AST_Hole, value);
+                    value.elements[prop] = node.right;
+                }
                 return true;
             }
 

diff --git a/test/compress/join_vars.js b/test/compress/join_vars.js
@@ -32,7 +32,7 @@ join_array_assignments_1: {
     }
     expect: {
         console.log(function () {
-            var a = ["moz", "baz", "bar", , , , , "moo"];
+            var a = [("foo", "moz"), "baz", "bar", , , , , "moo"];
             return a;
         }().join());
     }
@@ -93,6 +93,7 @@ join_array_assignments_4: {
     options = {
         evaluate: true,
         join_vars: true,
+        side_effects: true,
     }
     input: {
         console.log(function () {
@@ -1492,3 +1493,18 @@ issue_5175: {
     }
     expect_stdout: "PASS PASS"
 }
+
+issue_5831: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+    }
+    input: {
+        var a = [ console.log("PASS") ];
+        a[0] = 42;
+    }
+    expect: {
+        var a = [ (console.log("PASS"), 42) ];
+    }
+    expect_stdout: "PASS"
+}