fix corner case in loops (#4565)

fixes #4564
mishoo · Jan 17, 2021 · e23a10f · e23a10f
1 parent 884ec4e
commit e23a10f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/lib/compress.js b/lib/compress.js
@@ -6169,7 +6169,7 @@ merge(Compressor.prototype, {
                 var def = sym.definition();
                 if (def.scope !== self) {
                     var d = find_variable(sym.name);
-                    if ((d && d.redefined() || d) === def) return;
+                    if (d === def || d && d.redefined() === def) return;
                 }
                 node.object.walk(tw);
                 return true;

diff --git a/test/compress/loops.js b/test/compress/loops.js
@@ -1280,3 +1280,33 @@ issue_4355: {
     }
     expect_stdout: "PASS"
 }
+
+issue_4564: {
+    options = {
+        loops: true,
+        unused: true,
+    }
+    input: {
+        try {
+            throw null;
+        } catch (a) {
+            var a;
+            (function() {
+                for (a in "foo");
+            })();
+            console.log(a);
+        }
+    }
+    expect: {
+        try {
+            throw null;
+        } catch (a) {
+            var a;
+            (function() {
+                for (a in "foo");
+            })();
+            console.log(a);
+        }
+    }
+    expect_stdout: "2"
+}
diff --git a/test/reduce.js b/test/reduce.js
@@ -666,7 +666,7 @@ function has_loopcontrol(body, loop, label) {
 }
 
 function is_error(result) {
-    return typeof result == "object" && typeof result.name == "string" && typeof result.message == "string";
+    return result && typeof result.name == "string" && typeof result.message == "string";
 }
 
 function is_timed_out(result) {