fix corner case in sequences (#4798)

mishoo · Mar 18, 2021 · 48c46fa · 48c46fa
1 parent 7da49b5
commit 48c46fa
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 6 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -9443,14 +9443,9 @@ merge(Compressor.prototype, {
             && !(exp instanceof AST_SymbolRef
                 || exp instanceof AST_PropAccess
                 || is_identifier_atom(exp))) {
-            if (exp instanceof AST_Sequence) {
-                exp = exp.expressions.slice();
-                exp.push(make_node(AST_True, self));
-                return make_sequence(self, exp).optimize(compressor);
-            }
             return make_sequence(self, [ exp, make_node(AST_True, self) ]).optimize(compressor);
         }
-        if (compressor.option("sequences") && !(op == "typeof" && is_undeclared_ref(exp.tail_node()))) {
+        if (compressor.option("sequences") && can_lift()) {
             var seq = lift_sequence_in_expression(self, compressor);
             if (seq !== self) return seq.optimize(compressor);
         }
@@ -9500,6 +9495,17 @@ merge(Compressor.prototype, {
         // avoids infinite recursion of numerals
         return op == "-" && (exp instanceof AST_Number || exp instanceof AST_Infinity)
             ? self : try_evaluate(compressor, self);
+
+        function can_lift() {
+            switch (op) {
+              case "delete":
+                return !is_identifier_atom(exp.tail_node());
+              case "typeof":
+                return !is_undeclared_ref(exp.tail_node());
+              default:
+                return true;
+            }
+        }
     });
 
     OPT(AST_Await, function(self, compressor) {

diff --git a/test/compress/sequences.js b/test/compress/sequences.js
@@ -564,6 +564,34 @@ delete_seq_3: {
 }
 
 delete_seq_4: {
+    options = {
+        booleans: true,
+        evaluate: false,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {}
+        console.log(delete (f(), undefined));
+        console.log(delete (f(), void 0));
+        console.log(delete (f(), Infinity));
+        console.log(delete (f(), 1 / 0));
+        console.log(delete (f(), NaN));
+        console.log(delete (f(), 0 / 0));
+    }
+    expect: {
+        function f() {}
+        console.log(delete void f()),
+        console.log(delete void f()),
+        console.log((f(), delete (1 / 0))),
+        console.log((f(), delete (1 / 0))),
+        console.log(delete (f(), NaN)),
+        console.log((f(), delete(0 / 0)));
+    }
+    expect_stdout: true
+}
+
+delete_seq_4_evaluate: {
     options = {
         booleans: true,
         evaluate: true,
@@ -592,6 +620,35 @@ delete_seq_4: {
 }
 
 delete_seq_5: {
+    options = {
+        booleans: true,
+        evaluate: false,
+        keep_infinity: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {}
+        console.log(delete (f(), undefined));
+        console.log(delete (f(), void 0));
+        console.log(delete (f(), Infinity));
+        console.log(delete (f(), 1 / 0));
+        console.log(delete (f(), NaN));
+        console.log(delete (f(), 0 / 0));
+    }
+    expect: {
+        function f() {}
+        console.log(delete void f()),
+        console.log(delete void f()),
+        console.log(delete (f(), Infinity)),
+        console.log((f(), delete (1 / 0))),
+        console.log(delete (f(), NaN)),
+        console.log((f(), delete (0 / 0)));
+    }
+    expect_stdout: true
+}
+
+delete_seq_5_evaluate: {
     options = {
         booleans: true,
         evaluate: true,