Merge pull request #23956 from Kingwl/emit-var-at-top

emit temporary vars at the top of the scope

Author: rbuckton

src/compiler/core.ts

@@ -951,6 +951,21 @@ namespace ts {
         return to;
     }
 
+    /**
+     * Appends a range of value to begin of an array, returning the array.
+     *
+     * @param to The array to which `value` is to be appended. If `to` is `undefined`, a new array
+     * is created if `value` was appended.
+     * @param from The values to append to the array. If `from` is `undefined`, nothing is
+     * appended. If an element of `from` is `undefined`, that element is not appended.
+     */
+    export function prependRange<T>(to: T[], from: ReadonlyArray<T> | undefined): T[] | undefined {
+        if (from === undefined || from.length === 0) return to;
+        if (to === undefined) return from.slice();
+        to.unshift(...from);
+        return to;
+    }
+
     /**
      * @return Whether the value was added.
      */

src/compiler/transformers/es2015.ts

@@ -529,7 +529,7 @@ namespace ts {
                     createVariableStatement(/*modifiers*/ undefined,
                         createVariableDeclarationList(taggedTemplateStringDeclarations)));
             }
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
             exitSubtree(ancestorFacts, HierarchyFacts.None, HierarchyFacts.None);
             return updateSourceFileNode(
                 node,
@@ -836,7 +836,7 @@ namespace ts {
             setEmitFlags(statement, EmitFlags.NoComments | EmitFlags.NoTokenSourceMaps);
             statements.push(statement);
 
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
 
             const block = createBlock(setTextRange(createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true);
             setEmitFlags(block, EmitFlags.NoComments);
@@ -979,7 +979,7 @@ namespace ts {
                 );
             }
 
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
 
             if (constructor) {
                 prependCaptureNewTargetIfNeeded(statements, constructor, /*copyOnWrite*/ false);
@@ -1894,7 +1894,7 @@ namespace ts {
             }
 
             const lexicalEnvironment = context.endLexicalEnvironment();
-            addRange(statements, lexicalEnvironment);
+            prependRange(statements, lexicalEnvironment);
 
             prependCaptureNewTargetIfNeeded(statements, node, /*copyOnWrite*/ false);
 
@@ -2712,7 +2712,7 @@ namespace ts {
                 if (loopOutParameters.length) {
                     copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements);
                 }
-                addRange(statements, lexicalEnvironment);
+                prependRange(statements, lexicalEnvironment);
                 loopBody = createBlock(statements, /*multiline*/ true);
             }
 
@@ -3309,10 +3309,12 @@ namespace ts {
             // expression, but we will restore them later to preserve comments and source maps.
             const body = cast(cast(skipOuterExpressions(node.expression), isArrowFunction).body, isBlock);
 
-            // The class statements are the statements generated by visiting the first statement of the
+            // The class statements are the statements generated by visiting the first statement with initializer of the
             // body (1), while all other statements are added to remainingStatements (2)
-            const classStatements = visitNodes(body.statements, visitor, isStatement, 0, 1);
-            const remainingStatements = visitNodes(body.statements, visitor, isStatement, 1, body.statements.length - 1);
+            const isVariableStatementWithInitializer = (stmt: Statement) => isVariableStatement(stmt) && !!firstOrUndefined(stmt.declarationList.declarations).initializer;
+            const bodyStatements = visitNodes(body.statements, visitor, isStatement);
+            const classStatements = filter(bodyStatements, isVariableStatementWithInitializer);
+            const remainingStatements = filter(bodyStatements, stmt => !isVariableStatementWithInitializer(stmt));
             const varStatement = cast(firstOrUndefined(classStatements), isVariableStatement);
 
             // We know there is only one variable declaration here as we verified this in an
@@ -3324,6 +3326,7 @@ namespace ts {
             // we see as an assignment, for example:
             //
             //  (function () {
+            //      var C_1;
             //      var C = C_1 = (function () {
             //          function C() {
             //          }
@@ -3332,7 +3335,6 @@ namespace ts {
             //      }());
             //      C = C_1 = __decorate([dec], C);
             //      return C;
-            //      var C_1;
             //  }())
             //
             const aliasAssignment = tryCast(initializer, isAssignmentExpression);

src/compiler/transformers/es2017.ts

@@ -412,7 +412,7 @@ namespace ts {
                     )
                 );
 
-                addRange(statements, endLexicalEnvironment());
+                prependRange(statements, endLexicalEnvironment());
 
                 const block = createBlock(statements, /*multiLine*/ true);
                 setTextRange(block, node.body);
@@ -443,7 +443,7 @@ namespace ts {
                 const declarations = endLexicalEnvironment();
                 if (some(declarations)) {
                     const block = convertToFunctionBody(expression);
-                    result = updateBlock(block, setTextRange(createNodeArray(concatenate(block.statements, declarations)), block.statements));
+                    result = updateBlock(block, setTextRange(createNodeArray(concatenate(declarations, block.statements)), block.statements));
                 }
                 else {
                     result = expression;

src/compiler/transformers/esnext.ts

@@ -663,7 +663,7 @@ namespace ts {
                 )
             );
 
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
             const block = updateBlock(node.body, statements);
 
             // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
@@ -692,11 +692,11 @@ namespace ts {
                 statementOffset = addPrologue(statements, body.statements, /*ensureUseStrict*/ false, visitor);
             }
             addRange(statements, appendObjectRestAssignmentsIfNeeded(/*statements*/ undefined, node));
-            const trailingStatements = endLexicalEnvironment();
-            if (statementOffset > 0 || some(statements) || some(trailingStatements)) {
+            const leadingStatements = endLexicalEnvironment();
+            if (statementOffset > 0 || some(statements) || some(leadingStatements)) {
                 const block = convertToFunctionBody(body, /*multiLine*/ true);
+                prependRange(statements, leadingStatements);
                 addRange(statements, block.statements.slice(statementOffset));
-                addRange(statements, trailingStatements);
                 return updateBlock(block, setTextRange(createNodeArray(statements), block.statements));
             }
             return body;

src/compiler/transformers/generators.ts

@@ -586,7 +586,7 @@ namespace ts {
             transformAndEmitStatements(body.statements, statementOffset);
 
             const buildResult = build();
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
             statements.push(createReturn(buildResult));
 
             // Restore previous generator state

src/compiler/transformers/module/module.ts

@@ -97,7 +97,7 @@ namespace ts {
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
 
             const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues && !compilerOptions.importHelpers) {
@@ -426,7 +426,7 @@ namespace ts {
 
             // End the lexical environment for the module body
             // and merge any new lexical declarations.
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
 
             const body = createBlock(statements, /*multiLine*/ true);
             if (currentModuleInfo.hasExportStarsToExportValues && !compilerOptions.importHelpers) {

src/compiler/transformers/module/system.ts

@@ -257,7 +257,7 @@ namespace ts {
             // We emit hoisted variables early to align roughly with our previous emit output.
             // Two key differences in this approach are:
             // - Temporary variables will appear at the top rather than at the bottom of the file
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
 
             const exportStarFunction = addExportStarIfNeeded(statements);
             const moduleObject = createObjectLiteral([

src/compiler/transformers/ts.ts

@@ -669,7 +669,7 @@ namespace ts {
                 setEmitFlags(statement, EmitFlags.NoComments | EmitFlags.NoTokenSourceMaps);
                 statements.push(statement);
 
-                addRange(statements, context.endLexicalEnvironment());
+                prependRange(statements, context.endLexicalEnvironment());
 
                 const iife = createImmediatelyInvokedArrowFunction(statements);
                 setEmitFlags(iife, EmitFlags.TypeScriptClassWrapper);
@@ -2685,8 +2685,9 @@ namespace ts {
 
             const statements: Statement[] = [];
             startLexicalEnvironment();
-            addRange(statements, map(node.members, transformEnumMember));
-            addRange(statements, endLexicalEnvironment());
+            const members = map(node.members, transformEnumMember);
+            prependRange(statements, endLexicalEnvironment());
+            addRange(statements, members);
 
             currentNamespaceContainerName = savedCurrentNamespaceLocalName;
             return createBlock(
@@ -3000,7 +3001,7 @@ namespace ts {
                 statementsLocation = moveRangePos(moduleBlock.statements, -1);
             }
 
-            addRange(statements, endLexicalEnvironment());
+            prependRange(statements, endLexicalEnvironment());
             currentNamespaceContainerName = savedCurrentNamespaceContainerName;
             currentNamespace = savedCurrentNamespace;
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;

src/compiler/visitor.ts

@@ -145,7 +145,7 @@ namespace ts {
             statements = setTextRange(createNodeArray([createStatement(createLiteral("use strict")), ...statements]), statements);
         }
         const declarations = context.endLexicalEnvironment();
-        return setTextRange(createNodeArray(concatenate(statements, declarations)), statements);
+        return setTextRange(createNodeArray(concatenate(declarations, statements)), statements);
     }
 
     /**
@@ -1468,8 +1468,8 @@ namespace ts {
         }
 
         return isNodeArray(statements)
-            ? setTextRange(createNodeArray(concatenate(statements, declarations)), statements)
-            : addRange(statements, declarations);
+            ? setTextRange(createNodeArray(concatenate(declarations, statements)), statements)
+            : prependRange(statements, declarations);
     }
 
     /**

tests/baselines/reference/ES5For-of30.js

@@ -7,11 +7,11 @@ for ([a = 1, b = ""] of tuple) {
 }
 
 //// [ES5For-of30.js]
+var _a, _b, _c;
 var a, b;
 var tuple = [2, "3"];
 for (var _i = 0, tuple_1 = tuple; _i < tuple_1.length; _i++) {
     _a = tuple_1[_i], _b = _a[0], a = _b === void 0 ? 1 : _b, _c = _a[1], b = _c === void 0 ? "" : _c;
     a;
     b;
 }
-var _a, _b, _c;

tests/baselines/reference/ES5For-of31.js

@@ -7,10 +7,10 @@ for ({ a: b = 1, b: a = ""} of []) {
 }
 
 //// [ES5For-of31.js]
+var _a, _b, _c;
 var a, b;
-for (var _i = 0, _a = []; _i < _a.length; _i++) {
-    _b = _a[_i], _c = _b.a, b = _c === void 0 ? 1 : _c, _d = _b.b, a = _d === void 0 ? "" : _d;
+for (var _i = 0, _d = []; _i < _d.length; _i++) {
+    _a = _d[_i], _b = _a.a, b = _b === void 0 ? 1 : _b, _c = _a.b, a = _c === void 0 ? "" : _c;
     a;
     b;
 }
-var _b, _c, _d;

tests/baselines/reference/ES5For-of33.js

@@ -18,8 +18,9 @@ sourceFile:ES5For-of33.ts
 >>>        }
 >>>    };
 >>>};
+>>>var e_1, _a;
 >>>try {
->>>    for (var _a = __values(['a', 'b', 'c']), _b = _a.next(); !_b.done; _b = _a.next()) {
+>>>    for (var _b = __values(['a', 'b', 'c']), _c = _b.next(); !_c.done; _c = _b.next()) {
 1 >^^^^
 2 >    ^^^^^
 3 >         ^^^^
@@ -50,23 +51,23 @@ sourceFile:ES5For-of33.ts
 13>                                          
 14>                                           
 15>                                                           ) 
-1 >Emitted(12, 5) Source(1, 1) + SourceIndex(0)
-2 >Emitted(12, 10) Source(1, 15) + SourceIndex(0)
-3 >Emitted(12, 14) Source(1, 15) + SourceIndex(0)
-4 >Emitted(12, 19) Source(1, 15) + SourceIndex(0)
-5 >Emitted(12, 28) Source(1, 15) + SourceIndex(0)
-6 >Emitted(12, 29) Source(1, 16) + SourceIndex(0)
-7 >Emitted(12, 32) Source(1, 19) + SourceIndex(0)
-8 >Emitted(12, 34) Source(1, 21) + SourceIndex(0)
-9 >Emitted(12, 37) Source(1, 24) + SourceIndex(0)
-10>Emitted(12, 39) Source(1, 26) + SourceIndex(0)
-11>Emitted(12, 42) Source(1, 29) + SourceIndex(0)
-12>Emitted(12, 43) Source(1, 30) + SourceIndex(0)
-13>Emitted(12, 44) Source(1, 30) + SourceIndex(0)
-14>Emitted(12, 60) Source(1, 30) + SourceIndex(0)
-15>Emitted(12, 88) Source(1, 32) + SourceIndex(0)
+1 >Emitted(13, 5) Source(1, 1) + SourceIndex(0)
+2 >Emitted(13, 10) Source(1, 15) + SourceIndex(0)
+3 >Emitted(13, 14) Source(1, 15) + SourceIndex(0)
+4 >Emitted(13, 19) Source(1, 15) + SourceIndex(0)
+5 >Emitted(13, 28) Source(1, 15) + SourceIndex(0)
+6 >Emitted(13, 29) Source(1, 16) + SourceIndex(0)
+7 >Emitted(13, 32) Source(1, 19) + SourceIndex(0)
+8 >Emitted(13, 34) Source(1, 21) + SourceIndex(0)
+9 >Emitted(13, 37) Source(1, 24) + SourceIndex(0)
+10>Emitted(13, 39) Source(1, 26) + SourceIndex(0)
+11>Emitted(13, 42) Source(1, 29) + SourceIndex(0)
+12>Emitted(13, 43) Source(1, 30) + SourceIndex(0)
+13>Emitted(13, 44) Source(1, 30) + SourceIndex(0)
+14>Emitted(13, 60) Source(1, 30) + SourceIndex(0)
+15>Emitted(13, 88) Source(1, 32) + SourceIndex(0)
 ---
->>>        var v = _b.value;
+>>>        var v = _c.value;
 1 >^^^^^^^^
 2 >        ^^^^
 3 >            ^
@@ -75,10 +76,10 @@ sourceFile:ES5For-of33.ts
 2 >        var 
 3 >            v
 4 >             
-1 >Emitted(13, 9) Source(1, 6) + SourceIndex(0)
-2 >Emitted(13, 13) Source(1, 10) + SourceIndex(0)
-3 >Emitted(13, 14) Source(1, 11) + SourceIndex(0)
-4 >Emitted(13, 25) Source(1, 11) + SourceIndex(0)
+1 >Emitted(14, 9) Source(1, 6) + SourceIndex(0)
+2 >Emitted(14, 13) Source(1, 10) + SourceIndex(0)
+3 >Emitted(14, 14) Source(1, 11) + SourceIndex(0)
+4 >Emitted(14, 25) Source(1, 11) + SourceIndex(0)
 ---
 >>>        console.log(v);
 1 >^^^^^^^^
@@ -98,28 +99,27 @@ sourceFile:ES5For-of33.ts
 6 >                    v
 7 >                     )
 8 >                      ;
-1 >Emitted(14, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(14, 16) Source(2, 12) + SourceIndex(0)
-3 >Emitted(14, 17) Source(2, 13) + SourceIndex(0)
-4 >Emitted(14, 20) Source(2, 16) + SourceIndex(0)
-5 >Emitted(14, 21) Source(2, 17) + SourceIndex(0)
-6 >Emitted(14, 22) Source(2, 18) + SourceIndex(0)
-7 >Emitted(14, 23) Source(2, 19) + SourceIndex(0)
-8 >Emitted(14, 24) Source(2, 20) + SourceIndex(0)
+1 >Emitted(15, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(15, 16) Source(2, 12) + SourceIndex(0)
+3 >Emitted(15, 17) Source(2, 13) + SourceIndex(0)
+4 >Emitted(15, 20) Source(2, 16) + SourceIndex(0)
+5 >Emitted(15, 21) Source(2, 17) + SourceIndex(0)
+6 >Emitted(15, 22) Source(2, 18) + SourceIndex(0)
+7 >Emitted(15, 23) Source(2, 19) + SourceIndex(0)
+8 >Emitted(15, 24) Source(2, 20) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^^
 1 >
   >}
-1 >Emitted(15, 6) Source(3, 2) + SourceIndex(0)
+1 >Emitted(16, 6) Source(3, 2) + SourceIndex(0)
 ---
 >>>}
 >>>catch (e_1_1) { e_1 = { error: e_1_1 }; }
 >>>finally {
 >>>    try {
->>>        if (_b && !_b.done && (_c = _a["return"])) _c.call(_a);
+>>>        if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
 >>>    }
 >>>    finally { if (e_1) throw e_1.error; }
 >>>}
->>>var e_1, _c;
 >>>//# sourceMappingURL=ES5For-of33.js.map