handle global constant collision with local variable after inline (#…

…2617) fixes #2616
mishoo · Dec 18, 2017 · 4b334ed · 4b334ed
1 parent 8ddcbc3
commit 4b334ed
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/lib/compress.js b/lib/compress.js
@@ -4028,13 +4028,16 @@ merge(Compressor.prototype, {
                         expressions.unshift(value || make_node(AST_Undefined, self));
                     }
                 } else {
+                    var def = name.definition();
                     scope.var_names()[name.name] = true;
+                    scope.variables.set(name.name, def);
+                    scope.enclosed.push(def);
                     decls.unshift(make_node(AST_VarDef, name, {
                         name: name,
                         value: null
                     }));
                     var sym = make_node(AST_SymbolRef, name, name);
-                    name.definition().references.push(sym);
+                    def.references.push(sym);
                     expressions.unshift(make_node(AST_Assign, self, {
                         operator: "=",
                         left: sym,

diff --git a/test/compress/functions.js b/test/compress/functions.js
@@ -1049,3 +1049,37 @@ unsafe_call_2: {
     }
     expect_stdout: true
 }
+
+issue_2616: {
+    options = {
+        evaluate: true,
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            function f() {
+                function g(NaN) {
+                    (true << NaN) - 0/0 || (c = "PASS");
+                }
+                g([]);
+            }
+            f();
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            (function() {
+                NaN = [], (true << NaN) - 0/0 || (c = "PASS");
+                var NaN;
+            })();
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}