From 70d72ad8065421908ff9a8658539359789c4f460 Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Fri, 3 Mar 2017 02:39:57 +0800
Subject: properly cover all cases of for-in loop variables (#1536)

---
 lib/compress.js              | 12 ++++++------
 test/compress/reduce_vars.js | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/lib/compress.js b/lib/compress.js
index d4b10b5d..f67f1d2c 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -243,13 +243,13 @@ merge(Compressor.prototype, {
                     return true;
                 }
                 if (node instanceof AST_ForIn) {
-                    if (node.init instanceof AST_SymbolRef) {
-                        var d = node.init.definition();
-                        d.references.push(node.init);
-                        d.fixed = false;
-                    } else {
-                        node.init.walk(tw);
+                    var sym = node.init;
+                    if (sym instanceof AST_Var) {
+                        sym = sym.definitions[0].name;
                     }
+                    var d = sym.definition();
+                    d.references.push(sym);
+                    d.fixed = false;
                     node.object.walk(tw);
                     push();
                     node.body.walk(tw);
diff --git a/test/compress/reduce_vars.js b/test/compress/reduce_vars.js
index 87b1fc2e..557631bd 100644
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -563,7 +563,7 @@ inner_var_for: {
     }
 }
 
-inner_var_for_in: {
+inner_var_for_in_1: {
     options = {
         evaluate: true,
         reduce_vars: true,
@@ -590,6 +590,21 @@ inner_var_for_in: {
     }
 }
 
+inner_var_for_in_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        for (var long_name in {})
+            console.log(long_name);
+    }
+    expect: {
+        for (var long_name in {})
+            console.log(long_name);
+    }
+}
+
 issue_1533_1: {
     options = {
         collapse_vars: true,
-- 
cgit v1.2.3

>
<div class='path'>path: <a href='/guix/log/?id=e53829be49901ac05127ebc73d33f9d6206606e9'>root</a>/<a href='/guix/log/gnu?id=e53829be49901ac05127ebc73d33f9d6206606e9'>gnu</a>/<a href='/guix/log/gnu/packages?id=e53829be49901ac05127ebc73d33f9d6206606e9'>packages</a>/<a href='/guix/log/gnu/packages/efi.scm?id=e53829be49901ac05127ebc73d33f9d6206606e9'>efi.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/efi.scm?id=e53829be49901ac05127ebc73d33f9d6206606e9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>