[Pkg-javascript-commits] [uglifyjs] 23/491: fix `unused` on for-in statements (#1843)

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/3.3.10-1
in repository uglifyjs.

commit 9e626281716c0f11ed6b289d6a48c7b681a99a1e
Author: Alex Lam S.L <alexlamsl at gmail.com>
Date:   Mon Apr 24 03:14:01 2017 +0800

    fix `unused` on for-in statements (#1843)
    
    Only need to avoid `var` within the initialisation block.
    
    fixes #1841
---
 lib/compress.js            |  2 +-
 test/compress/functions.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/lib/compress.js b/lib/compress.js
index 5a8f23b..0f4dd25 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -1970,7 +1970,7 @@ merge(Compressor.prototype, {
                         }
                         return node;
                     }
-                    if (drop_vars && node instanceof AST_Definitions && !(tt.parent() instanceof AST_ForIn)) {
+                    if (drop_vars && node instanceof AST_Definitions && !(tt.parent() instanceof AST_ForIn && tt.parent().init === node)) {
                         // place uninitialized names at the start
                         var body = [], head = [], tail = [];
                         // for unused names whose initialization has
diff --git a/test/compress/functions.js b/test/compress/functions.js
index dca4062..2a2d096 100644
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -93,3 +93,55 @@ issue_485_crashing_1530: {
         this, void 0;
     }
 }
+
+issue_1841_1: {
+    options = {
+        keep_fargs: false,
+        pure_getters: "strict",
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                var n = arg.baz, n = [ b = 42 ];
+        }(--b);
+        console.log(b);
+    }
+    expect: {
+        var b = 10;
+        !function() {
+            for (var key in "hi")
+                b = 42;
+        }(--b);
+        console.log(b);
+    }
+    expect_exact: "42"
+}
+
+issue_1841_2: {
+    options = {
+        keep_fargs: false,
+        pure_getters: false,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                var n = arg.baz, n = [ b = 42 ];
+        }(--b);
+        console.log(b);
+    }
+    expect: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                arg.baz, b = 42;
+        }(--b);
+        console.log(b);
+    }
+    expect_exact: "42"
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/uglifyjs.git