fix corner cases with template literals (#4780)

mishoo · Mar 15, 2021 · 176581d · 176581d
1 parent 01aa078
commit 176581d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -1511,6 +1511,8 @@ merge(Compressor.prototype, {
         var wrap = false;
         if (parent.TYPE == "Call") {
             wrap = parent.expression === orig && needs_unbinding(compressor, val);
+        } else if (parent instanceof AST_Template) {
+            wrap = parent.tag === orig && needs_unbinding(compressor, val);
         } else if (parent instanceof AST_UnaryPrefix) {
             wrap = parent.operator == "delete"
                 || parent.operator == "typeof" && is_undeclared_ref(val);

diff --git a/lib/output.js b/lib/output.js
@@ -746,6 +746,8 @@ function OutputStream(options) {
             || p instanceof AST_PropAccess && p.expression === this
             // ...(foo, bar, baz)
             || p instanceof AST_Spread
+            // (foo, bar)`baz`
+            || p instanceof AST_Template && p.tag === this
             // !(foo, bar, baz)
             || p instanceof AST_Unary
             // var a = (1, 2), b = a + a; ---> b == 4

diff --git a/test/compress/templates.js b/test/compress/templates.js
@@ -73,6 +73,20 @@ tag_parentheses_new: {
     node_version: ">=4"
 }
 
+tag_parentheses_sequence: {
+    input: {
+        var o = {
+            f() {
+                console.log(this === o ? "FAIL" : "PASS");
+            },
+        };
+        (42, o.f)``;
+    }
+    expect_exact: 'var o={f(){console.log(this===o?"FAIL":"PASS")}};(42,o.f)``;'
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
 malformed_escape: {
     input: {
         (function(s) {
@@ -211,7 +225,7 @@ unsafe_evaluate: {
     node_version: ">=8"
 }
 
-side_effects: {
+side_effects_1: {
     options = {
         side_effects: true,
     }
@@ -228,6 +242,30 @@ side_effects: {
     node_version: ">=4"
 }
 
+side_effects_2: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        var o = {
+            f() {
+                console.log(this === o ? "FAIL" : "PASS");
+            },
+        };
+        (42, o.f)``;
+    }
+    expect: {
+        var o = {
+            f() {
+                console.log(this === o ? "FAIL" : "PASS");
+            },
+        };
+        (0, o.f)``;
+    }
+    expect_stdout: "PASS"
+    node_version: ">=4"
+}
+
 unsafe_side_effects: {
     options = {
         side_effects: true,

diff --git a/test/ufuzz/index.js b/test/ufuzz/index.js
@@ -1493,7 +1493,9 @@ function _createExpression(recurmax, noComma, stmtDepth, canThrow) {
       case p++:
         var name = getVarName();
         var fn = name + "." + getDotKey();
-        var s = "typeof " + fn + ' == "function" && --_calls_ >= 0 && ' + fn + createArgs(recurmax, stmtDepth, canThrow);
+        var s = "typeof " + fn + ' == "function" && --_calls_ >= 0 && ';
+        s += rng(5) ? fn : "(" + createExpression(recurmax, NO_COMMA, stmtDepth, canThrow) + ", " + fn + ")";
+        s += createArgs(recurmax, stmtDepth, canThrow);
         return mayDefer(canThrow && rng(20) == 0 ? s : name + " && " + s);
       case p++:
         if (SUPPORT.class) {