Merge pull request #7693 from Microsoft/transforms-block-scoped-bindings

Add support for captured block scoped bindings
2026-05-27 22:39:59 -05:00 · 2016-03-29 09:39:20 -07:00
parent 6ba02858f0 5d8d3b85bd
commit 3989d232b0
33 changed files with 1172 additions and 291 deletions
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop1.js
@@ -10,7 +10,7 @@ declare function use(n: number): void;
 //// [blockScopedBindingsReassignedInLoop1.js]
 (function () {
    'use strict';
-    var _loop_1 = function(i) {
+    var _loop_1 = function (i) {
        (function () { return use(++i); })();
        out_i_1 = i;
    };
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop2.js
@@ -42,7 +42,7 @@ for (let x = 1, y = 2; x < y; ++x, --y) {
 }

 //// [blockScopedBindingsReassignedInLoop2.js]
-var _loop_1 = function(x, y) {
+var _loop_1 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_1 = x, out_y_1 = y, "break";
@@ -58,9 +58,10 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
    var state_1 = _loop_1(x, y);
    x = out_x_1;
    y = out_y_1;
-    if (state_1 === "break") break;
+    if (state_1 === "break")
+        break;
 }
-var _loop_2 = function(x, y) {
+var _loop_2 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_2 = x, out_y_2 = y, "continue";
@@ -77,7 +78,7 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
    x = out_x_2;
    y = out_y_2;
 }
-var _loop_3 = function(x, y) {
+var _loop_3 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_3 = x, out_y_3 = y, "break-loop";
@@ -90,14 +91,14 @@ var _loop_3 = function(x, y) {
 };
 var out_x_3, out_y_3;
 loop: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_3 = _loop_3(x, y);
+    var state_2 = _loop_3(x, y);
    x = out_x_3;
    y = out_y_3;
-    switch(state_3) {
+    switch (state_2) {
        case "break-loop": break loop;
    }
 }
-var _loop_4 = function(x, y) {
+var _loop_4 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_4 = x, out_y_4 = y, "continue-loop";
@@ -110,10 +111,10 @@ var _loop_4 = function(x, y) {
 };
 var out_x_4, out_y_4;
 loop: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_4 = _loop_4(x, y);
+    var state_3 = _loop_4(x, y);
    x = out_x_4;
    y = out_y_4;
-    switch(state_4) {
+    switch (state_3) {
        case "continue-loop": continue loop;
    }
 }
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop3.js
@@ -93,28 +93,29 @@ for (let x = 1, y = 2; x < y; ++x, --y) {


 //// [blockScopedBindingsReassignedInLoop3.js]
-var _loop_1 = function(x, y) {
+var _loop_1 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_1 = x, out_y_1 = y, "break";
    }
    else {
-        var _loop_2 = function(a_1) {
+        var _loop_2 = function (a_1) {
            var f = function () { return a_1; };
            if (a_1) {
                a_1 = x;
-                return out_a_1_1 = a_1, "break";
+                return out_a_1 = a_1, "break";
            }
            else {
                y++;
            }
-            out_a_1_1 = a_1;
+            out_a_1 = a_1;
        };
-        var out_a_1_1;
+        var out_a_1;
        for (var a_1 = 1; a_1 < 5; --a_1) {
            var state_1 = _loop_2(a_1);
-            a_1 = out_a_1_1;
-            if (state_1 === "break") break;
+            a_1 = out_a_1;
+            if (state_1 === "break")
+                break;
        }
        y = 5;
    }
@@ -126,29 +127,30 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
    var state_2 = _loop_1(x, y);
    x = out_x_1;
    y = out_y_1;
-    if (state_2 === "break") break;
+    if (state_2 === "break")
+        break;
 }
-var _loop_3 = function(x, y) {
+var _loop_3 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_2 = x, out_y_2 = y, "continue";
    }
    else {
-        var _loop_4 = function(a_2) {
+        var _loop_4 = function (a_2) {
            var f = function () { return a_2; };
            if (a_2) {
                a_2 = x;
-                return out_a_2_1 = a_2, "continue";
+                return out_a_2 = a_2, "continue";
            }
            else {
                y++;
            }
-            out_a_2_1 = a_2;
+            out_a_2 = a_2;
        };
-        var out_a_2_1;
+        var out_a_2;
        for (var a_2 = 1; a_2 < 5; --a_2) {
            _loop_4(a_2);
-            a_2 = out_a_2_1;
+            a_2 = out_a_2;
        }
        y = 5;
    }
@@ -161,31 +163,31 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
    x = out_x_2;
    y = out_y_2;
 }
-var _loop_5 = function(x, y) {
+var _loop_5 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_3 = x, out_y_3 = y, "break-loop2";
    }
    else {
-        var _loop_6 = function(a_3) {
+        var _loop_6 = function (a_3) {
            var f = function () { return a_3; };
            if (a_3) {
                a_3 = x;
-                return out_a_3_1 = a_3, "break-loop1";
+                return out_a_3 = a_3, "break-loop1";
            }
            else {
                y++;
-                return out_a_3_1 = a_3, "break-loop2";
+                return out_a_3 = a_3, "break-loop2";
            }
-            out_a_3_1 = a_3;
+            out_a_3 = a_3;
        };
-        var out_a_3_1;
+        var out_a_3;
        loop1: for (var a_3 = 1; a_3 < 5; --a_3) {
-            var state_5 = _loop_6(a_3);
-            a_3 = out_a_3_1;
-            switch(state_5) {
+            var state_3 = _loop_6(a_3);
+            a_3 = out_a_3;
+            switch (state_3) {
                case "break-loop1": break loop1;
-                case "break-loop2": return state_5;
+                case "break-loop2": return state_3;
            }
        }
        y = 5;
@@ -195,38 +197,38 @@ var _loop_5 = function(x, y) {
 };
 var out_x_3, out_y_3;
 loop2: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_6 = _loop_5(x, y);
+    var state_4 = _loop_5(x, y);
    x = out_x_3;
    y = out_y_3;
-    switch(state_6) {
+    switch (state_4) {
        case "break-loop2": break loop2;
    }
 }
-var _loop_7 = function(x, y) {
+var _loop_7 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1) {
        return out_x_4 = x, out_y_4 = y, "continue-loop2";
    }
    else {
-        var _loop_8 = function(a_4) {
+        var _loop_8 = function (a_4) {
            var f = function () { return a_4; };
            if (a_4) {
                a_4 = x;
-                return out_a_4_1 = a_4, "continue-loop1";
+                return out_a_4 = a_4, "continue-loop1";
            }
            else {
                y++;
-                return out_a_4_1 = a_4, "continue-loop2";
+                return out_a_4 = a_4, "continue-loop2";
            }
-            out_a_4_1 = a_4;
+            out_a_4 = a_4;
        };
-        var out_a_4_1;
+        var out_a_4;
        loop1: for (var a_4 = 1; a_4 < 5; --a_4) {
-            var state_7 = _loop_8(a_4);
-            a_4 = out_a_4_1;
-            switch(state_7) {
+            var state_5 = _loop_8(a_4);
+            a_4 = out_a_4;
+            switch (state_5) {
                case "continue-loop1": continue loop1;
-                case "continue-loop2": return state_7;
+                case "continue-loop2": return state_5;
            }
        }
        y = 5;
@@ -236,10 +238,10 @@ var _loop_7 = function(x, y) {
 };
 var out_x_4, out_y_4;
 loop2: for (var x = 1, y = 2; x < y; ++x, --y) {
-    var state_8 = _loop_7(x, y);
+    var state_6 = _loop_7(x, y);
    x = out_x_4;
    y = out_y_4;
-    switch(state_8) {
+    switch (state_6) {
        case "continue-loop2": continue loop2;
    }
 }
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop4.js
@@ -13,7 +13,7 @@ function f1() {

 //// [blockScopedBindingsReassignedInLoop4.js]
 function f1() {
-    var _loop_1 = function(x, y) {
+    var _loop_1 = function (x, y) {
        var a = function () { return x++ + y++; };
        if (x == 1) {
            return { value: 1 };
@@ -29,6 +29,7 @@ function f1() {
        var state_1 = _loop_1(x, y);
        x = out_x_1;
        y = out_y_1;
-        if (typeof state_1 === "object") return state_1.value;
+        if (typeof state_1 === "object")
+            return state_1.value;
    }
 }
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop5.js
@@ -9,7 +9,7 @@ for (let x = 1, y = 2; x < y; ++x, --y) {


 //// [blockScopedBindingsReassignedInLoop5.js]
-var _loop_1 = function(x, y) {
+var _loop_1 = function (x, y) {
    var a = function () { return x++ + y++; };
    if (x == 1)
        return out_x_1 = x, out_y_1 = y, "break";
@@ -23,5 +23,6 @@ for (var x = 1, y = 2; x < y; ++x, --y) {
    var state_1 = _loop_1(x, y);
    x = out_x_1;
    y = out_y_1;
-    if (state_1 === "break") break;
+    if (state_1 === "break")
+        break;
 }
--- a/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
+++ b/tests/baselines/reference/blockScopedBindingsReassignedInLoop6.js
@@ -31,7 +31,7 @@ function f2() {

 //// [blockScopedBindingsReassignedInLoop6.js]
 function f1() {
-    var _loop_1 = function(x, y) {
+    var _loop_1 = function (x, y) {
        var a = function () { return x++ + y++; };
        if (x == 1)
            return out_x_1 = x, out_y_1 = y, "break";
@@ -47,12 +47,14 @@ function f1() {
        var state_1 = _loop_1(x, y);
        x = out_x_1;
        y = out_y_1;
-        if (typeof state_1 === "object") return state_1.value;
-        if (state_1 === "break") break;
+        if (typeof state_1 === "object")
+            return state_1.value;
+        if (state_1 === "break")
+            break;
    }
 }
 function f2() {
-    var _loop_2 = function(x, y) {
+    var _loop_2 = function (x, y) {
        var a = function () { return x++ + y++; };
        if (x == 1)
            return out_x_2 = x, out_y_2 = y, "break";
@@ -68,7 +70,9 @@ function f2() {
        var state_2 = _loop_2(x, y);
        x = out_x_2;
        y = out_y_2;
-        if (typeof state_2 === "object") return state_2.value;
-        if (state_2 === "break") break;
+        if (typeof state_2 === "object")
+            return state_2.value;
+        if (state_2 === "break")
+            break;
    }
 }
--- a/tests/baselines/reference/capturedLetConstInLoop10.js
+++ b/tests/baselines/reference/capturedLetConstInLoop10.js
@@ -50,7 +50,7 @@ var A = (function () {
    function A() {
    }
    A.prototype.foo = function () {
-        var _loop_1 = function(x) {
+        var _loop_1 = function (x) {
            var f = function () { return x; };
            this_1.bar(f());
        };
@@ -63,9 +63,9 @@ var A = (function () {
    A.prototype.bar = function (a) {
    };
    A.prototype.baz = function () {
-        var _loop_2 = function(x) {
+        var _loop_2 = function (x) {
            var a = function () { return x; };
-            var _loop_3 = function(y) {
+            var _loop_3 = function (y) {
                var b = function () { return y; };
                this_2.bar(b());
            };
@@ -76,16 +76,16 @@ var A = (function () {
            this_2.bar(a());
        };
        var this_2 = this;
-        for (var _b = 0, _c = [1]; _b < _c.length; _b++) {
-            var x = _c[_b];
+        for (var _i = 0, _a = [1]; _i < _a.length; _i++) {
+            var x = _a[_i];
            _loop_2(x);
        }
    };
    A.prototype.baz2 = function () {
-        var _loop_4 = function(x) {
+        var _loop_4 = function (x) {
            var a = function () { return x; };
            this_3.bar(a());
-            var _loop_5 = function(y) {
+            var _loop_5 = function (y) {
                var b = function () { return y; };
                this_3.bar(b());
            };
@@ -95,8 +95,8 @@ var A = (function () {
            }
        };
        var this_3 = this;
-        for (var _b = 0, _c = [1]; _b < _c.length; _b++) {
-            var x = _c[_b];
+        for (var _i = 0, _a = [1]; _i < _a.length; _i++) {
+            var x = _a[_i];
            _loop_4(x);
        }
    };
@@ -108,7 +108,7 @@ var B = (function () {
    B.prototype.foo = function () {
        var _this = this;
        var a = function () {
-            var _loop_6 = function(x) {
+            var _loop_6 = function (x) {
                var f = function () { return x; };
                _this.bar(f());
            };
--- a/tests/baselines/reference/capturedLetConstInLoop11.js
+++ b/tests/baselines/reference/capturedLetConstInLoop11.js
@@ -14,7 +14,7 @@ function foo() {
 }

 //// [capturedLetConstInLoop11.js]
-var _loop_1 = function() {
+var _loop_1 = function () {
    var x = 1;
    (function () { return x; });
 };
@@ -22,14 +22,15 @@ for (;;) {
    _loop_1();
 }
 function foo() {
-    var _loop_2 = function() {
+    var _loop_2 = function () {
        var a = 0;
        switch (a) {
            case 0: return { value: function () { return a; } };
        }
    };
    for (;;) {
-        var state_2 = _loop_2();
-        if (typeof state_2 === "object") return state_2.value;
+        var state_1 = _loop_2();
+        if (typeof state_1 === "object")
+            return state_1.value;
    }
 }
--- a/tests/baselines/reference/capturedLetConstInLoop11_ES6.js
+++ b/tests/baselines/reference/capturedLetConstInLoop11_ES6.js
@@ -16,7 +16,7 @@ function foo() {
 //// [capturedLetConstInLoop11_ES6.js]
 for (;;) {
    let x = 1;
-    (() => x);
+    () => x;
 }
 function foo() {
    for (;;) {
--- a/tests/baselines/reference/capturedLetConstInLoop12.js
+++ b/tests/baselines/reference/capturedLetConstInLoop12.js
@@ -18,8 +18,11 @@
 //// [capturedLetConstInLoop12.js]
 (function () {
    "use strict";
-    var _loop_1 = function(i) {
-        (function () { return (_a = [i + 1], i = _a[0], _a); var _a; })();
+    var _loop_1 = function (i) {
+        (function () {
+            return _a = [i + 1], i = _a[0], _a;
+            var _a;
+        })();
        out_i_1 = i;
    };
    var out_i_1;
@@ -30,8 +33,11 @@
 })();
 (function () {
    "use strict";
-    var _loop_2 = function(i) {
-        (function () { return (_a = { a: i + 1 }, i = _a.a, _a); var _a; })();
+    var _loop_2 = function (i) {
+        (function () {
+            return (_a = { a: i + 1 }, i = _a.a, _a);
+            var _a;
+        })();
        out_i_2 = i;
    };
    var out_i_2;
--- a/tests/baselines/reference/capturedLetConstInLoop2.js
+++ b/tests/baselines/reference/capturedLetConstInLoop2.js
@@ -179,7 +179,7 @@ function foo8_c(x) {
 //// [capturedLetConstInLoop2.js]
 // ========let
 function foo0(x) {
-    var _loop_1 = function(x_1) {
+    var _loop_1 = function (x_1) {
        var a = arguments_1.length;
        (function () { return x_1 + a; });
        (function () { return x_1 + a; });
@@ -191,7 +191,7 @@ function foo0(x) {
    }
 }
 function foo0_1(x) {
-    var _loop_2 = function(x_2) {
+    var _loop_2 = function (x_2) {
        var a = arguments_2.length;
        (function () { return x_2 + a; });
        (function () { return x_2 + a; });
@@ -202,7 +202,7 @@ function foo0_1(x) {
    }
 }
 function foo1(x) {
-    var _loop_3 = function(x_3) {
+    var _loop_3 = function (x_3) {
        var a = arguments_3.length;
        (function () { return x_3 + a; });
        (function () { return x_3 + a; });
@@ -213,7 +213,7 @@ function foo1(x) {
    }
 }
 function foo2(x) {
-    var _loop_4 = function() {
+    var _loop_4 = function () {
        var a = arguments_4.length;
        (function () { return x + a; });
        (function () { return x + a; });
@@ -224,7 +224,7 @@ function foo2(x) {
    }
 }
 function foo3(x) {
-    var _loop_5 = function() {
+    var _loop_5 = function () {
        var x_4;
        var a = arguments_5.length;
        (function () { return x_4 + a; });
@@ -236,7 +236,7 @@ function foo3(x) {
    } while (1 === 1);
 }
 function foo4(x) {
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
        var a = arguments_6.length;
        var x_5 = 1;
        (function () { return x_5 + a; });
@@ -248,7 +248,7 @@ function foo4(x) {
    }
 }
 function foo5(x) {
-    var _loop_7 = function(x_6, y) {
+    var _loop_7 = function (x_6, y) {
        var a = arguments_7.length;
        (function () { return x_6 + y + a; });
        (function () { return x_6 + y + a; });
@@ -259,7 +259,7 @@ function foo5(x) {
    }
 }
 function foo6(x) {
-    var _loop_8 = function() {
+    var _loop_8 = function () {
        var x_7, y;
        var a = arguments_8.length;
        (function () { return x_7 + y + a; });
@@ -271,7 +271,7 @@ function foo6(x) {
    }
 }
 function foo7(x) {
-    var _loop_9 = function() {
+    var _loop_9 = function () {
        var x_8, y;
        var a = arguments_9.length;
        (function () { return x_8 + y + a; });
@@ -283,7 +283,7 @@ function foo7(x) {
    } while (1 === 1);
 }
 function foo8(x) {
-    var _loop_10 = function(y) {
+    var _loop_10 = function (y) {
        var x_9 = 1;
        var a = arguments_10.length;
        (function () { return x_9 + y + a; });
@@ -296,7 +296,7 @@ function foo8(x) {
 }
 ///=======const
 function foo0_c(x) {
-    var _loop_11 = function(x_10) {
+    var _loop_11 = function (x_10) {
        var a = arguments_11.length;
        (function () { return x_10 + a; });
        (function () { return x_10 + a; });
@@ -308,7 +308,7 @@ function foo0_c(x) {
    }
 }
 function foo0_1_c(x) {
-    var _loop_12 = function(x_11) {
+    var _loop_12 = function (x_11) {
        var a = arguments_12.length;
        (function () { return x_11 + a; });
        (function () { return x_11 + a; });
@@ -319,7 +319,7 @@ function foo0_1_c(x) {
    }
 }
 function foo1_c(x) {
-    var _loop_13 = function(x_12) {
+    var _loop_13 = function (x_12) {
        var a = arguments_13.length;
        (function () { return x_12 + a; });
        (function () { return x_12 + a; });
@@ -330,7 +330,7 @@ function foo1_c(x) {
    }
 }
 function foo2_c(x) {
-    var _loop_14 = function() {
+    var _loop_14 = function () {
        var a = arguments_14.length;
        (function () { return x + a; });
        (function () { return x + a; });
@@ -341,7 +341,7 @@ function foo2_c(x) {
    }
 }
 function foo3_c(x) {
-    var _loop_15 = function() {
+    var _loop_15 = function () {
        var x_13 = 1;
        var a = arguments_15.length;
        (function () { return x_13 + a; });
@@ -353,7 +353,7 @@ function foo3_c(x) {
    } while (1 === 1);
 }
 function foo4_c(x) {
-    var _loop_16 = function(y) {
+    var _loop_16 = function (y) {
        var a = arguments_16.length;
        var x_14 = 1;
        (function () { return x_14 + a; });
@@ -365,7 +365,7 @@ function foo4_c(x) {
    }
 }
 function foo5_c(x) {
-    var _loop_17 = function(x_15, y) {
+    var _loop_17 = function (x_15, y) {
        var a = arguments_17.length;
        (function () { return x_15 + y + a; });
        (function () { return x_15 + y + a; });
@@ -376,7 +376,7 @@ function foo5_c(x) {
    }
 }
 function foo6_c(x) {
-    var _loop_18 = function() {
+    var _loop_18 = function () {
        var x_16 = 1, y = 1;
        var a = arguments_18.length;
        (function () { return x_16 + y + a; });
@@ -388,7 +388,7 @@ function foo6_c(x) {
    }
 }
 function foo7_c(x) {
-    var _loop_19 = function() {
+    var _loop_19 = function () {
        var x_17 = 1, y = 1;
        var a = arguments_19.length;
        (function () { return x_17 + y + a; });
@@ -400,7 +400,7 @@ function foo7_c(x) {
    } while (1 === 1);
 }
 function foo8_c(x) {
-    var _loop_20 = function(y) {
+    var _loop_20 = function (y) {
        var x_18 = 1;
        var a = arguments_20.length;
        (function () { return x_18 + y + a; });
--- a/tests/baselines/reference/capturedLetConstInLoop3.js
+++ b/tests/baselines/reference/capturedLetConstInLoop3.js
@@ -219,7 +219,7 @@ function foo8_c(x) {

 //// [capturedLetConstInLoop3.js]
 function foo0(x) {
-    var _loop_1 = function(x_1) {
+    var _loop_1 = function (x_1) {
        v = x_1;
        (function () { return x_1 + v; });
        (function () { return x_1 + v; });
@@ -232,7 +232,7 @@ function foo0(x) {
    use(v);
 }
 function foo0_1(x) {
-    var _loop_2 = function(x_2) {
+    var _loop_2 = function (x_2) {
        v = x_2;
        (function () { return x_2 + v; });
        (function () { return x_2 + v; });
@@ -244,7 +244,7 @@ function foo0_1(x) {
    use(v);
 }
 function foo1(x) {
-    var _loop_3 = function(x_3) {
+    var _loop_3 = function (x_3) {
        v = x_3;
        (function () { return x_3 + v; });
        (function () { return x_3 + v; });
@@ -256,7 +256,7 @@ function foo1(x) {
    use(v);
 }
 function foo2(x) {
-    var _loop_4 = function() {
+    var _loop_4 = function () {
        var x_4 = 1;
        v = x_4;
        (function () { return x_4 + v; });
@@ -269,7 +269,7 @@ function foo2(x) {
    use(v);
 }
 function foo3(x) {
-    var _loop_5 = function() {
+    var _loop_5 = function () {
        var x_5;
        (function () { return x_5 + v; });
        (function () { return x_5 + v; });
@@ -281,7 +281,7 @@ function foo3(x) {
    use(v);
 }
 function foo4(x) {
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
        v = y;
        var x_6 = 1;
        (function () { return x_6 + v; });
@@ -294,7 +294,7 @@ function foo4(x) {
    use(v);
 }
 function foo5(x) {
-    var _loop_7 = function(x_7, y) {
+    var _loop_7 = function (x_7, y) {
        v = x_7;
        (function () { return x_7 + y + v; });
        (function () { return x_7 + y + v; });
@@ -306,7 +306,7 @@ function foo5(x) {
    use(v);
 }
 function foo6(x) {
-    var _loop_8 = function() {
+    var _loop_8 = function () {
        var x_8, y;
        v = x_8;
        (function () { return x_8 + y + v; });
@@ -319,7 +319,7 @@ function foo6(x) {
    use(v);
 }
 function foo7(x) {
-    var _loop_9 = function() {
+    var _loop_9 = function () {
        var x_9, y;
        v = x_9;
        (function () { return x_9 + y + v; });
@@ -332,7 +332,7 @@ function foo7(x) {
    use(v);
 }
 function foo8(x) {
-    var _loop_10 = function(y) {
+    var _loop_10 = function (y) {
        var x_10 = 1;
        v = x_10;
        (function () { return x_10 + y + v; });
@@ -346,7 +346,7 @@ function foo8(x) {
 }
 //===const
 function foo0_c(x) {
-    var _loop_11 = function(x_11) {
+    var _loop_11 = function (x_11) {
        v = x_11;
        (function () { return x_11 + v; });
        (function () { return x_11 + v; });
@@ -359,7 +359,7 @@ function foo0_c(x) {
    use(v);
 }
 function foo0_1_c(x) {
-    var _loop_12 = function(x_12) {
+    var _loop_12 = function (x_12) {
        v = x_12;
        (function () { return x_12 + v; });
        (function () { return x_12 + v; });
@@ -371,7 +371,7 @@ function foo0_1_c(x) {
    use(v);
 }
 function foo1_c(x) {
-    var _loop_13 = function(x_13) {
+    var _loop_13 = function (x_13) {
        v = x_13;
        (function () { return x_13 + v; });
        (function () { return x_13 + v; });
@@ -383,7 +383,7 @@ function foo1_c(x) {
    use(v);
 }
 function foo2_c(x) {
-    var _loop_14 = function() {
+    var _loop_14 = function () {
        var x_14 = 1;
        v = x_14;
        (function () { return x_14 + v; });
@@ -396,7 +396,7 @@ function foo2_c(x) {
    use(v);
 }
 function foo3_c(x) {
-    var _loop_15 = function() {
+    var _loop_15 = function () {
        var x_15 = 1;
        (function () { return x_15 + v; });
        (function () { return x_15 + v; });
@@ -408,7 +408,7 @@ function foo3_c(x) {
    use(v);
 }
 function foo4_c(x) {
-    var _loop_16 = function(y) {
+    var _loop_16 = function (y) {
        v = y;
        var x_16 = 1;
        (function () { return x_16 + v; });
@@ -421,7 +421,7 @@ function foo4_c(x) {
    use(v);
 }
 function foo5_c(x) {
-    var _loop_17 = function(x_17, y) {
+    var _loop_17 = function (x_17, y) {
        v = x_17;
        (function () { return x_17 + y + v; });
        (function () { return x_17 + y + v; });
@@ -433,7 +433,7 @@ function foo5_c(x) {
    use(v);
 }
 function foo6_c(x) {
-    var _loop_18 = function() {
+    var _loop_18 = function () {
        var x_18 = 1, y = 1;
        v = x_18;
        (function () { return x_18 + y + v; });
@@ -446,7 +446,7 @@ function foo6_c(x) {
    use(v);
 }
 function foo7_c(x) {
-    var _loop_19 = function() {
+    var _loop_19 = function () {
        var x_19 = 1, y = 1;
        v = x_19;
        (function () { return x_19 + y + v; });
@@ -459,7 +459,7 @@ function foo7_c(x) {
    use(v);
 }
 function foo8_c(x) {
-    var _loop_20 = function(y) {
+    var _loop_20 = function (y) {
        var x_20 = 1;
        v = x_20;
        (function () { return x_20 + y + v; });
--- a/tests/baselines/reference/capturedLetConstInLoop4.js
+++ b/tests/baselines/reference/capturedLetConstInLoop4.js
@@ -144,24 +144,24 @@ for (const y = 0; y < 1;) {


 //// [capturedLetConstInLoop4.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
    "use strict";
    var __moduleName = context_1 && context_1.id;
-    var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c;
    //======let
    function exportedFoo() {
        return v0 + v00 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8;
    }
-    exports_1("exportedFoo", exportedFoo);
    //======const
    function exportedFoo2() {
        return v0_c + v00_c + v1_c + v2_c + v3_c + v4_c + v5_c + v6_c + v7_c + v8_c;
    }
+    var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c;
+    exports_1("exportedFoo", exportedFoo);
    exports_1("exportedFoo2", exportedFoo2);
    return {
-        setters:[],
-        execute: function() {
-            var _loop_1 = function(x) {
+        setters: [],
+        execute: function () {
+            var _loop_1 = function (x) {
                v0 = x;
                (function () { return x + v0; });
                (function () { return x; });
@@ -170,7 +170,7 @@ System.register([], function(exports_1, context_1) {
                var x = _a[_i];
                _loop_1(x);
            }
-            var _loop_2 = function(x) {
+            var _loop_2 = function (x) {
                v00 = x;
                (function () { return x + v00; });
                (function () { return x; });
@@ -178,7 +178,7 @@ System.register([], function(exports_1, context_1) {
            for (var x in []) {
                _loop_2(x);
            }
-            var _loop_3 = function(x) {
+            var _loop_3 = function (x) {
                v1 = x;
                (function () { return x + v1; });
                (function () { return x; });
@@ -186,7 +186,7 @@ System.register([], function(exports_1, context_1) {
            for (var x = 0; x < 1; ++x) {
                _loop_3(x);
            }
-            var _loop_4 = function() {
+            var _loop_4 = function () {
                var x;
                v2 = x;
                (function () { return x + v2; });
@@ -195,7 +195,7 @@ System.register([], function(exports_1, context_1) {
            while (1 === 1) {
                _loop_4();
            }
-            var _loop_5 = function() {
+            var _loop_5 = function () {
                var x;
                v3 = x;
                (function () { return x + v3; });
@@ -204,7 +204,7 @@ System.register([], function(exports_1, context_1) {
            do {
                _loop_5();
            } while (1 === 1);
-            var _loop_6 = function(y) {
+            var _loop_6 = function (y) {
                var x = 1;
                v4 = x;
                (function () { return x + v4; });
@@ -213,7 +213,7 @@ System.register([], function(exports_1, context_1) {
            for (var y = 0; y < 1; ++y) {
                _loop_6(y);
            }
-            var _loop_7 = function(x, y) {
+            var _loop_7 = function (x, y) {
                v5 = x;
                (function () { return x + y + v5; });
                (function () { return x + y; });
@@ -221,7 +221,7 @@ System.register([], function(exports_1, context_1) {
            for (var x = 0, y = 1; x < 1; ++x) {
                _loop_7(x, y);
            }
-            var _loop_8 = function() {
+            var _loop_8 = function () {
                var x, y;
                v6 = x;
                (function () { return x + y + v6; });
@@ -230,7 +230,7 @@ System.register([], function(exports_1, context_1) {
            while (1 === 1) {
                _loop_8();
            }
-            var _loop_9 = function() {
+            var _loop_9 = function () {
                var x, y;
                v7 = x;
                (function () { return x + y + v7; });
@@ -239,7 +239,7 @@ System.register([], function(exports_1, context_1) {
            do {
                _loop_9();
            } while (1 === 1);
-            var _loop_10 = function(y) {
+            var _loop_10 = function (y) {
                var x = 1;
                v8 = x;
                (function () { return x + y + v8; });
@@ -248,7 +248,7 @@ System.register([], function(exports_1, context_1) {
            for (var y = 0; y < 1; ++y) {
                _loop_10(y);
            }
-            var _loop_11 = function(x) {
+            var _loop_11 = function (x) {
                v0_c = x;
                (function () { return x + v0_c; });
                (function () { return x; });
@@ -257,7 +257,7 @@ System.register([], function(exports_1, context_1) {
                var x = _c[_b];
                _loop_11(x);
            }
-            var _loop_12 = function(x) {
+            var _loop_12 = function (x) {
                v00_c = x;
                (function () { return x + v00; });
                (function () { return x; });
@@ -265,7 +265,7 @@ System.register([], function(exports_1, context_1) {
            for (var x in []) {
                _loop_12(x);
            }
-            var _loop_13 = function(x) {
+            var _loop_13 = function (x) {
                v1_c = x;
                (function () { return x + v1_c; });
                (function () { return x; });
@@ -273,7 +273,7 @@ System.register([], function(exports_1, context_1) {
            for (var x = 0; x < 1;) {
                _loop_13(x);
            }
-            var _loop_14 = function() {
+            var _loop_14 = function () {
                var x = 1;
                v2_c = x;
                (function () { return x + v2_c; });
@@ -282,7 +282,7 @@ System.register([], function(exports_1, context_1) {
            while (1 === 1) {
                _loop_14();
            }
-            var _loop_15 = function() {
+            var _loop_15 = function () {
                var x = 1;
                v3_c = x;
                (function () { return x + v3_c; });
@@ -291,7 +291,7 @@ System.register([], function(exports_1, context_1) {
            do {
                _loop_15();
            } while (1 === 1);
-            var _loop_16 = function(y) {
+            var _loop_16 = function (y) {
                var x = 1;
                v4_c = x;
                (function () { return x + v4_c; });
@@ -300,7 +300,7 @@ System.register([], function(exports_1, context_1) {
            for (var y = 0; y < 1;) {
                _loop_16(y);
            }
-            var _loop_17 = function(x, y) {
+            var _loop_17 = function (x, y) {
                v5_c = x;
                (function () { return x + y + v5_c; });
                (function () { return x + y; });
@@ -308,7 +308,7 @@ System.register([], function(exports_1, context_1) {
            for (var x = 0, y = 1; x < 1;) {
                _loop_17(x, y);
            }
-            var _loop_18 = function() {
+            var _loop_18 = function () {
                var x = 1, y = 1;
                v6_c = x;
                (function () { return x + y + v6_c; });
@@ -317,7 +317,7 @@ System.register([], function(exports_1, context_1) {
            while (1 === 1) {
                _loop_18();
            }
-            var _loop_19 = function() {
+            var _loop_19 = function () {
                var x = 1, y = 1;
                v7_c = x;
                (function () { return x + y + v7_c; });
@@ -326,7 +326,7 @@ System.register([], function(exports_1, context_1) {
            do {
                _loop_19();
            } while (1 === 1);
-            var _loop_20 = function(y) {
+            var _loop_20 = function (y) {
                var x = 1;
                v8_c = x;
                (function () { return x + y + v8_c; });
@@ -336,5 +336,5 @@ System.register([], function(exports_1, context_1) {
                _loop_20(y);
            }
        }
-    }
+    };
 });
--- a/tests/baselines/reference/capturedLetConstInLoop5.js
+++ b/tests/baselines/reference/capturedLetConstInLoop5.js
@@ -282,7 +282,7 @@ function foo8_c(x) {
 //// [capturedLetConstInLoop5.js]
 //====let
 function foo0(x) {
-    var _loop_1 = function(x_1) {
+    var _loop_1 = function (x_1) {
        v = x_1;
        (function () { return x_1 + v; });
        (function () { return x_1 + v; });
@@ -294,12 +294,13 @@ function foo0(x) {
    for (var _i = 0, _a = []; _i < _a.length; _i++) {
        var x_1 = _a[_i];
        var state_1 = _loop_1(x_1);
-        if (typeof state_1 === "object") return state_1.value;
+        if (typeof state_1 === "object")
+            return state_1.value;
    }
    use(v);
 }
 function foo00(x) {
-    var _loop_2 = function(x_2) {
+    var _loop_2 = function (x_2) {
        v = x_2;
        (function () { return x_2 + v; });
        (function () { return x_2 + v; });
@@ -310,12 +311,13 @@ function foo00(x) {
    var v;
    for (var x_2 in []) {
        var state_2 = _loop_2(x_2);
-        if (typeof state_2 === "object") return state_2.value;
+        if (typeof state_2 === "object")
+            return state_2.value;
    }
    use(v);
 }
 function foo1(x) {
-    var _loop_3 = function(x_3) {
+    var _loop_3 = function (x_3) {
        v = x_3;
        (function () { return x_3 + v; });
        (function () { return x_3 + v; });
@@ -326,12 +328,13 @@ function foo1(x) {
    var v;
    for (var x_3 = 0; x_3 < 1; ++x_3) {
        var state_3 = _loop_3(x_3);
-        if (typeof state_3 === "object") return state_3.value;
+        if (typeof state_3 === "object")
+            return state_3.value;
    }
    use(v);
 }
 function foo2(x) {
-    var _loop_4 = function() {
+    var _loop_4 = function () {
        var x_4 = 1;
        v = x_4;
        (function () { return x_4 + v; });
@@ -343,12 +346,13 @@ function foo2(x) {
    var v;
    while (1 === 1) {
        var state_4 = _loop_4();
-        if (typeof state_4 === "object") return state_4.value;
+        if (typeof state_4 === "object")
+            return state_4.value;
    }
    use(v);
 }
 function foo3(x) {
-    var _loop_5 = function() {
+    var _loop_5 = function () {
        var x_5;
        (function () { return x_5 + v; });
        (function () { return x_5 + v; });
@@ -359,12 +363,13 @@ function foo3(x) {
    var v;
    do {
        var state_5 = _loop_5();
-        if (typeof state_5 === "object") return state_5.value;
+        if (typeof state_5 === "object")
+            return state_5.value;
    } while (1 === 1);
    use(v);
 }
 function foo4(x) {
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
        v = y;
        var x_6 = 1;
        (function () { return x_6 + v; });
@@ -376,12 +381,13 @@ function foo4(x) {
    var v;
    for (var y = 0; y < 1; ++y) {
        var state_6 = _loop_6(y);
-        if (typeof state_6 === "object") return state_6.value;
+        if (typeof state_6 === "object")
+            return state_6.value;
    }
    use(v);
 }
 function foo5(x) {
-    var _loop_7 = function(x_7, y) {
+    var _loop_7 = function (x_7, y) {
        v = x_7;
        (function () { return x_7 + y + v; });
        (function () { return x_7 + y + v; });
@@ -392,12 +398,13 @@ function foo5(x) {
    var v;
    for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) {
        var state_7 = _loop_7(x_7, y);
-        if (typeof state_7 === "object") return state_7.value;
+        if (typeof state_7 === "object")
+            return state_7.value;
    }
    use(v);
 }
 function foo6(x) {
-    var _loop_8 = function() {
+    var _loop_8 = function () {
        var x_8, y;
        v = x_8;
        (function () { return x_8 + y + v; });
@@ -409,13 +416,14 @@ function foo6(x) {
    var v;
    while (1 === 1) {
        var state_8 = _loop_8();
-        if (typeof state_8 === "object") return state_8.value;
+        if (typeof state_8 === "object")
+            return state_8.value;
    }
    ;
    use(v);
 }
 function foo7(x) {
-    var _loop_9 = function() {
+    var _loop_9 = function () {
        var x_9, y;
        v = x_9;
        (function () { return x_9 + y + v; });
@@ -427,12 +435,13 @@ function foo7(x) {
    var v;
    do {
        var state_9 = _loop_9();
-        if (typeof state_9 === "object") return state_9.value;
+        if (typeof state_9 === "object")
+            return state_9.value;
    } while (1 === 1);
    use(v);
 }
 function foo8(x) {
-    var _loop_10 = function(y) {
+    var _loop_10 = function (y) {
        var x_10 = 1;
        v = x_10;
        (function () { return x_10 + y + v; });
@@ -444,13 +453,14 @@ function foo8(x) {
    var v;
    for (var y = 0; y < 1; ++y) {
        var state_10 = _loop_10(y);
-        if (typeof state_10 === "object") return state_10.value;
+        if (typeof state_10 === "object")
+            return state_10.value;
    }
    use(v);
 }
 //====const
 function foo0_c(x) {
-    var _loop_11 = function(x_11) {
+    var _loop_11 = function (x_11) {
        v = x_11;
        (function () { return x_11 + v; });
        (function () { return x_11 + v; });
@@ -462,12 +472,13 @@ function foo0_c(x) {
    for (var _i = 0, _a = []; _i < _a.length; _i++) {
        var x_11 = _a[_i];
        var state_11 = _loop_11(x_11);
-        if (typeof state_11 === "object") return state_11.value;
+        if (typeof state_11 === "object")
+            return state_11.value;
    }
    use(v);
 }
 function foo00_c(x) {
-    var _loop_12 = function(x_12) {
+    var _loop_12 = function (x_12) {
        v = x_12;
        (function () { return x_12 + v; });
        (function () { return x_12 + v; });
@@ -478,12 +489,13 @@ function foo00_c(x) {
    var v;
    for (var x_12 in []) {
        var state_12 = _loop_12(x_12);
-        if (typeof state_12 === "object") return state_12.value;
+        if (typeof state_12 === "object")
+            return state_12.value;
    }
    use(v);
 }
 function foo1_c(x) {
-    var _loop_13 = function(x_13) {
+    var _loop_13 = function (x_13) {
        v = x_13;
        (function () { return x_13 + v; });
        (function () { return x_13 + v; });
@@ -494,12 +506,13 @@ function foo1_c(x) {
    var v;
    for (var x_13 = 0; x_13 < 1;) {
        var state_13 = _loop_13(x_13);
-        if (typeof state_13 === "object") return state_13.value;
+        if (typeof state_13 === "object")
+            return state_13.value;
    }
    use(v);
 }
 function foo2_c(x) {
-    var _loop_14 = function() {
+    var _loop_14 = function () {
        var x_14 = 1;
        v = x_14;
        (function () { return x_14 + v; });
@@ -511,12 +524,13 @@ function foo2_c(x) {
    var v;
    while (1 === 1) {
        var state_14 = _loop_14();
-        if (typeof state_14 === "object") return state_14.value;
+        if (typeof state_14 === "object")
+            return state_14.value;
    }
    use(v);
 }
 function foo3_c(x) {
-    var _loop_15 = function() {
+    var _loop_15 = function () {
        var x_15 = 1;
        (function () { return x_15 + v; });
        (function () { return x_15 + v; });
@@ -527,12 +541,13 @@ function foo3_c(x) {
    var v;
    do {
        var state_15 = _loop_15();
-        if (typeof state_15 === "object") return state_15.value;
+        if (typeof state_15 === "object")
+            return state_15.value;
    } while (1 === 1);
    use(v);
 }
 function foo4_c(x) {
-    var _loop_16 = function(y) {
+    var _loop_16 = function (y) {
        v = y;
        var x_16 = 1;
        (function () { return x_16 + v; });
@@ -544,12 +559,13 @@ function foo4_c(x) {
    var v;
    for (var y = 0; y < 1;) {
        var state_16 = _loop_16(y);
-        if (typeof state_16 === "object") return state_16.value;
+        if (typeof state_16 === "object")
+            return state_16.value;
    }
    use(v);
 }
 function foo5_c(x) {
-    var _loop_17 = function(x_17, y) {
+    var _loop_17 = function (x_17, y) {
        v = x_17;
        (function () { return x_17 + y + v; });
        (function () { return x_17 + y + v; });
@@ -560,12 +576,13 @@ function foo5_c(x) {
    var v;
    for (var x_17 = 0, y = 1; x_17 < 1;) {
        var state_17 = _loop_17(x_17, y);
-        if (typeof state_17 === "object") return state_17.value;
+        if (typeof state_17 === "object")
+            return state_17.value;
    }
    use(v);
 }
 function foo6_c(x) {
-    var _loop_18 = function() {
+    var _loop_18 = function () {
        var x_18 = 1, y = 1;
        v = x_18;
        (function () { return x_18 + y + v; });
@@ -577,12 +594,13 @@ function foo6_c(x) {
    var v;
    while (1 === 1) {
        var state_18 = _loop_18();
-        if (typeof state_18 === "object") return state_18.value;
+        if (typeof state_18 === "object")
+            return state_18.value;
    }
    use(v);
 }
 function foo7_c(x) {
-    var _loop_19 = function() {
+    var _loop_19 = function () {
        var x_19 = 1, y = 1;
        v = x_19;
        (function () { return x_19 + y + v; });
@@ -594,12 +612,13 @@ function foo7_c(x) {
    var v;
    do {
        var state_19 = _loop_19();
-        if (typeof state_19 === "object") return state_19.value;
+        if (typeof state_19 === "object")
+            return state_19.value;
    } while (1 === 1);
    use(v);
 }
 function foo8_c(x) {
-    var _loop_20 = function(y) {
+    var _loop_20 = function (y) {
        var x_20 = 1;
        v = x_20;
        (function () { return x_20 + y + v; });
@@ -611,7 +630,8 @@ function foo8_c(x) {
    var v;
    for (var y = 0; y < 1;) {
        var state_20 = _loop_20(y);
-        if (typeof state_20 === "object") return state_20.value;
+        if (typeof state_20 === "object")
+            return state_20.value;
    }
    use(v);
 }
--- a/tests/baselines/reference/capturedLetConstInLoop8.js
+++ b/tests/baselines/reference/capturedLetConstInLoop8.js
@@ -129,8 +129,8 @@ function foo_c() {
 //// [capturedLetConstInLoop8.js]
 function foo() {
    l0: for (var z = 0; z < 1; ++z) {
-        var _loop_1 = function(x) {
-            var _loop_2 = function(y) {
+        var _loop_1 = function (x) {
+            var _loop_2 = function (y) {
                (function () { return x + y; });
                (function () { return x + y; });
                if (y == 1) {
@@ -163,9 +163,11 @@ function foo() {
            };
            ll1: for (var y = 0; y < 1; ++y) {
                var state_1 = _loop_2(y);
-                if (typeof state_1 === "object") return state_1;
-                if (state_1 === "break") break;
-                switch(state_1) {
+                if (typeof state_1 === "object")
+                    return state_1;
+                if (state_1 === "break")
+                    break;
+                switch (state_1) {
                    case "break-l1": return state_1;
                    case "break-ll1": break ll1;
                    case "continue-l0": return state_1;
@@ -197,9 +199,11 @@ function foo() {
        };
        l1: for (var x = 0; x < 1; ++x) {
            var state_2 = _loop_1(x);
-            if (typeof state_2 === "object") return state_2.value;
-            if (state_2 === "break") break;
-            switch(state_2) {
+            if (typeof state_2 === "object")
+                return state_2.value;
+            if (state_2 === "break")
+                break;
+            switch (state_2) {
                case "break-l1": break l1;
                case "continue-l0": continue l0;
                case "continue-l1": continue l1;
@@ -209,8 +213,8 @@ function foo() {
 }
 function foo_c() {
    l0: for (var z = 0; z < 1;) {
-        var _loop_3 = function(x) {
-            var _loop_4 = function(y) {
+        var _loop_3 = function (x) {
+            var _loop_4 = function (y) {
                (function () { return x + y; });
                (function () { return x + y; });
                if (y == 1) {
@@ -243,9 +247,11 @@ function foo_c() {
            };
            ll1: for (var y = 0; y < 1;) {
                var state_3 = _loop_4(y);
-                if (typeof state_3 === "object") return state_3;
-                if (state_3 === "break") break;
-                switch(state_3) {
+                if (typeof state_3 === "object")
+                    return state_3;
+                if (state_3 === "break")
+                    break;
+                switch (state_3) {
                    case "break-l1": return state_3;
                    case "break-ll1": break ll1;
                    case "continue-l0": return state_3;
@@ -277,9 +283,11 @@ function foo_c() {
        };
        l1: for (var x = 0; x < 1;) {
            var state_4 = _loop_3(x);
-            if (typeof state_4 === "object") return state_4.value;
-            if (state_4 === "break") break;
-            switch(state_4) {
+            if (typeof state_4 === "object")
+                return state_4.value;
+            if (state_4 === "break")
+                break;
+            switch (state_4) {
                case "break-l1": break l1;
                case "continue-l0": continue l0;
                case "continue-l1": continue l1;
--- a/tests/baselines/reference/capturedLetConstInLoop9.js
+++ b/tests/baselines/reference/capturedLetConstInLoop9.js
@@ -139,7 +139,7 @@ function foo3 () {
 }

 //// [capturedLetConstInLoop9.js]
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
    var x_1;
    (function () { return x_1; });
    {
@@ -157,7 +157,7 @@ var _loop_1 = function(x) {
            (function () { return x_4; });
            break;
    }
-    var _loop_2 = function() {
+    var _loop_2 = function () {
        var x_5;
        (function () { return x_5; });
    };
@@ -177,7 +177,7 @@ for (var x = 0; x < 1; ++x) {
    _loop_1(x);
 }
 function foo() {
-    var _loop_3 = function(a) {
+    var _loop_3 = function (a) {
        if (a === 1) {
            return "break";
        }
@@ -198,8 +198,8 @@ function foo() {
            }
            return { value: 50 };
        }
-        var _loop_4 = function(b) {
-            _c = [{ x1: 1, y: arguments_1.length }][0], x1 = _c.x1, z1 = _c.y;
+        var _loop_4 = function (b) {
+            _a = [{ x1: 1, y: arguments_1.length }][0], x1 = _a.x1, z1 = _a.y;
            if (b === 1) {
                return "break";
            }
@@ -209,25 +209,28 @@ function foo() {
            (function () { return b; });
            return { value: 100 };
        };
-        for (var _d = 0, _e = []; _d < _e.length; _d++) {
-            var b = _e[_d];
-            var state_3 = _loop_4(b);
-            if (typeof state_3 === "object") return state_3;
-            if (state_3 === "break") break;
-            switch(state_3) {
-                case "break-l0": return state_3;
+        for (var _c = 0, _d = []; _c < _d.length; _c++) {
+            var b = _d[_c];
+            var state_1 = _loop_4(b);
+            if (typeof state_1 === "object")
+                return state_1;
+            if (state_1 === "break")
+                break;
+            switch (state_1) {
+                case "break-l0": return state_1;
            }
        }
        (function () { return a; });
    };
-    var arguments_1 = arguments;
-    var x, z, x1, z1;
-    l0: for (var _f = 0, _g = []; _f < _g.length; _f++) {
-        var a = _g[_f];
-        var state_4 = _loop_3(a);
-        if (typeof state_4 === "object") return state_4.value;
-        if (state_4 === "break") break;
-        switch(state_4) {
+    var arguments_1 = arguments, x, z, x1, z1;
+    l0: for (var _i = 0, _a = []; _i < _a.length; _i++) {
+        var a = _a[_i];
+        var state_2 = _loop_3(a);
+        if (typeof state_2 === "object")
+            return state_2.value;
+        if (state_2 === "break")
+            break;
+        switch (state_2) {
            case "break-l0": break l0;
        }
    }
@@ -235,6 +238,7 @@ function foo() {
    use(z);
    use(x1);
    use(z1);
+    var _b, _a;
 }
 function foo2() {
    for (var _i = 0, _a = []; _i < _a.length; _i++) {
@@ -272,7 +276,7 @@ var C = (function () {
    }
    C.prototype.foo = function () {
        var _this = this;
-        var _loop_5 = function(i) {
+        var _loop_5 = function (i) {
            var f = function () { return _this.N * i; };
        };
        for (var i = 0; i < 100; i++) {
@@ -283,7 +287,7 @@ var C = (function () {
 }());
 function foo3() {
    var x = arguments.length;
-    var _loop_6 = function(y) {
+    var _loop_6 = function (y) {
        var z = arguments_2.length;
        (function () { return y + z + arguments.length; });
    };
--- a/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
+++ b/tests/baselines/reference/capturedLetConstInLoop9_ES6.js
@@ -196,10 +196,10 @@ function foo() {
            if (b === 2) {
                break l0;
            }
-            (() => b);
+            () => b;
            return 100;
        }
-        (() => a);
+        () => a;
    }
    use(x);
    use(z);
--- a/tests/baselines/reference/nestedBlockScopedBindings14.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings14.js
@@ -13,7 +13,7 @@ for (; false;) {

 //// [nestedBlockScopedBindings14.js]
 var x;
-var _loop_1 = function() {
+var _loop_1 = function () {
    var x_1;
    (function () { return x_1; });
 };
--- a/tests/baselines/reference/nestedBlockScopedBindings15.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings15.js
@@ -32,7 +32,7 @@ for (; false;) {
 }

 //// [nestedBlockScopedBindings15.js]
-var _loop_1 = function() {
+var _loop_1 = function () {
    {
        var x_1;
        (function () { return x_1; });
@@ -47,7 +47,7 @@ for (; false;) {
        y = 1;
    }
 }
-var _loop_2 = function() {
+var _loop_2 = function () {
    switch (1) {
        case 1:
            var z0_1;
--- a/tests/baselines/reference/nestedBlockScopedBindings16.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings16.js
@@ -37,7 +37,7 @@ for (; false;) {

 //// [nestedBlockScopedBindings16.js]
 var x;
-var _loop_1 = function() {
+var _loop_1 = function () {
    {
        var x_1;
        (function () { return x_1; });
@@ -54,7 +54,7 @@ for (; false;) {
    }
 }
 var z0;
-var _loop_2 = function() {
+var _loop_2 = function () {
    switch (1) {
        case 1:
            var z0_1;
--- a/tests/baselines/reference/nestedBlockScopedBindings3.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings3.js
@@ -71,7 +71,7 @@ function a5() {
 //// [nestedBlockScopedBindings3.js]
 function a0() {
    {
-        var _loop_1 = function(x) {
+        var _loop_1 = function (x) {
            (function () { return x; });
        };
        for (var x = 0; x < 1;) {
@@ -79,7 +79,7 @@ function a0() {
        }
    }
    {
-        var _loop_2 = function(x) {
+        var _loop_2 = function (x) {
            (function () { return x; });
        };
        for (var x = void 0;;) {
@@ -88,13 +88,13 @@ function a0() {
    }
 }
 function a1() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
        (function () { return x; });
    };
    for (var x = void 0; x < 1;) {
        _loop_3(x);
    }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
        (function () { return x; });
    };
    for (var x = void 0;;) {
@@ -120,7 +120,7 @@ function a3() {
    }
 }
 function a4() {
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
        x = x + 1;
        (function () { return x; });
        out_x_1 = x;
@@ -137,7 +137,7 @@ function a4() {
    }
 }
 function a5() {
-    var _loop_6 = function(x) {
+    var _loop_6 = function (x) {
        x = x + 1;
        (function () { return x; });
        out_x_2 = x;
--- a/tests/baselines/reference/nestedBlockScopedBindings4.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings4.js
@@ -50,7 +50,7 @@ function a0() {
    }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
        x = x + 1;
        (function () { return x; });
        out_x_1 = x;
@@ -68,7 +68,7 @@ function a2() {
    for (var x = void 0; x < 1;) {
        x = x + 1;
    }
-    var _loop_2 = function(x) {
+    var _loop_2 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_2 = x;
@@ -80,7 +80,7 @@ function a2() {
    }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
        x = x + 1;
        (function () { return x; });
        out_x_3 = x;
@@ -90,7 +90,7 @@ function a3() {
        _loop_3(x);
        x = out_x_3;
    }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_4 = x;
--- a/tests/baselines/reference/nestedBlockScopedBindings5.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings5.js
@@ -90,7 +90,7 @@ function a0() {
    }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
        x = x + 1;
        (function () { return x; });
    };
@@ -105,7 +105,7 @@ function a2() {
    for (var x in []) {
        x = x + 1;
    }
-    var _loop_2 = function(x) {
+    var _loop_2 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_1 = x;
@@ -117,14 +117,14 @@ function a2() {
    }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
        x = x + 1;
        (function () { return x; });
    };
    for (var x in []) {
        _loop_3(x);
    }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_2 = x;
@@ -160,7 +160,7 @@ function a5() {
    for (var x in []) {
        x = x + 1;
    }
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_3 = x;
--- a/tests/baselines/reference/nestedBlockScopedBindings6.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings6.js
@@ -99,7 +99,7 @@ function a0() {
    }
 }
 function a1() {
-    var _loop_1 = function(x) {
+    var _loop_1 = function (x) {
        x = x + 1;
        (function () { return x; });
    };
@@ -116,7 +116,7 @@ function a2() {
        var x = _a[_i];
        x = x + 1;
    }
-    var _loop_2 = function(x) {
+    var _loop_2 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_1 = x;
@@ -128,7 +128,7 @@ function a2() {
    }
 }
 function a3() {
-    var _loop_3 = function(x) {
+    var _loop_3 = function (x) {
        x = x + 1;
        (function () { return x; });
    };
@@ -136,7 +136,7 @@ function a3() {
        var x = _a[_i];
        _loop_3(x);
    }
-    var _loop_4 = function(x) {
+    var _loop_4 = function (x) {
        x = x + 2;
        (function () { return x; });
        out_x_2 = x;
@@ -148,7 +148,7 @@ function a3() {
    }
 }
 function a4() {
-    var _loop_5 = function(x) {
+    var _loop_5 = function (x) {
        x = x + 1;
        (function () { return x; });
    };
@@ -186,7 +186,7 @@ function a6() {
    }
 }
 function a7() {
-    var _loop_6 = function(x) {
+    var _loop_6 = function (x) {
        x = x + 1;
        (function () { return x; });
    };
--- a/tests/baselines/reference/nestedBlockScopedBindings7.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings7.js
@@ -8,7 +8,7 @@ for (let y; false;) {
 }

 //// [nestedBlockScopedBindings7.js]
-var _loop_1 = function(x) {
+var _loop_1 = function (x) {
    (function () { return x; });
 };
 for (var x = void 0; false;) {
--- a/tests/baselines/reference/nestedBlockScopedBindings8.js
+++ b/tests/baselines/reference/nestedBlockScopedBindings8.js
@@ -11,7 +11,7 @@ for (let y; false; ) {

 //// [nestedBlockScopedBindings8.js]
 var x;
-var _loop_1 = function(x_1) {
+var _loop_1 = function (x_1) {
    (function () { return x_1; });
 };
 for (var x_1; false;) {