From cb50a2d192ef8be1aac7577d6ec9c06f27b71232 Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Thu, 4 Mar 2021 09:13:54 +0000
Subject: fix corner case in `collapse_vars` (#4733)

fixes #4732
---
 lib/compress.js                |  3 ++-
 test/compress/collapse_vars.js | 48 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/lib/compress.js b/lib/compress.js
index ed048593..6a59a9d5 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -2675,9 +2675,10 @@ merge(Compressor.prototype, {
                     if (hit_index <= end) return handle_custom_scan_order(node, tt);
                     hit = true;
                     if (node instanceof AST_VarDef) {
-                        node.value = null;
                         declare_only[node.name.name] = (declare_only[node.name.name] || 0) + 1;
                         if (value_def) value_def.replaced++;
+                        node = node.clone();
+                        node.value = null;
                         return node;
                     }
                     return in_list ? List.skip : null;
diff --git a/test/compress/collapse_vars.js b/test/compress/collapse_vars.js
index c0a545c5..6e82e8b0 100644
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -8756,3 +8756,51 @@ issue_4586_2: {
     }
     expect_stdout: "PASS"
 }
+
+issue_4732_1: {
+    options = {
+        booleans: true,
+        collapse_vars: true,
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var a = 0;
+        (function(b) {
+            var b = a++;
+            var c = b ? b && console.log("PASS") : 0;
+        })(a++);
+    }
+    expect: {
+        var a = 0;
+        (function(b) {
+            (b = a++) && (b && console.log("PASS"));
+        })(a++);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_4732_2: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var a = 0;
+        (function(b) {
+            var b = a++;
+            var c = b ? b && console.log("PASS") : 0;
+        })(a++);
+    }
+    expect: {
+        var a = 0;
+        (function(b) {
+            (b = a++) && b && console.log("PASS");
+        })(a++);
+    }
+    expect_stdout: "PASS"
+}
-- 
cgit v1.2.3