avoid shouldCaptureInTempVariable

Kingwl · Kingwl · commit 11bed4456bb2 · 2020-05-16T08:09:46.000+08:00
diff --git a/src/compiler/transformers/es2020.ts b/src/compiler/transformers/es2020.ts
@@ -73,7 +73,7 @@ namespace ts {
 
             let thisArg: Expression | undefined;
             if (captureThisArg) {
-                if (shouldCaptureInTempVariable(expression)) {
+                if (!isSimpleCopiableExpression(expression)) {
                     thisArg = createTempVariable(hoistVariableDeclaration);
                     expression = createAssignment(thisArg, expression);
                     // if (inParameterInitializer) tempVariableInParameter = true;
@@ -113,7 +113,7 @@ namespace ts {
             const leftThisArg = isSyntheticReference(left) ? left.thisArg : undefined;
             let leftExpression = isSyntheticReference(left) ? left.expression : left;
             let capturedLeft: Expression = leftExpression;
-            if (shouldCaptureInTempVariable(leftExpression)) {
+            if (!isSimpleCopiableExpression(leftExpression)) {
                 capturedLeft = createTempVariable(hoistVariableDeclaration);
                 leftExpression = createAssignment(capturedLeft, leftExpression);
                 // if (inParameterInitializer) tempVariableInParameter = true;
@@ -126,7 +126,7 @@ namespace ts {
                     case SyntaxKind.PropertyAccessExpression:
                     case SyntaxKind.ElementAccessExpression:
                         if (i === chain.length - 1 && captureThisArg) {
-                            if (shouldCaptureInTempVariable(rightExpression)) {
+                            if (!isSimpleCopiableExpression(rightExpression)) {
                                 thisArg = createTempVariable(hoistVariableDeclaration);
                                 rightExpression = createAssignment(thisArg, rightExpression);
                                 // if (inParameterInitializer) tempVariableInParameter = true;
@@ -184,7 +184,7 @@ namespace ts {
         function transformNullishCoalescingExpression(node: BinaryExpression) {
             let left = visitNode(node.left, visitor, isExpression);
             let right = left;
-            if (shouldCaptureInTempVariable(left)) {
+            if (!isSimpleCopiableExpression(left)) {
                 right = createTempVariable(hoistVariableDeclaration);
                 left = createAssignment(right, left);
                 // if (inParameterInitializer) tempVariableInParameter = true;
diff --git a/src/compiler/transformers/utilities.ts b/src/compiler/transformers/utilities.ts
@@ -280,14 +280,6 @@ namespace ts {
         }
     }
 
-    export function shouldCaptureInTempVariable(expression: Expression): boolean {
-        // don't capture identifiers and `this` in a temporary variable
-        // `super` cannot be captured as it's not a real variable
-        return !isIdentifier(expression) &&
-            expression.kind !== SyntaxKind.ThisKeyword &&
-            expression.kind !== SyntaxKind.SuperKeyword;
-    }
-
     /**
      * Adds super call and preceding prologue directives into the list of statements.
      *

Original file line number	Diff line number	Diff line change
`@@ -280,14 +280,6 @@ namespace ts {`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`
`283`		`- export function shouldCaptureInTempVariable(expression: Expression): boolean {`
`284`		- // don't capture identifiers and `this` in a temporary variable
`285`		- // `super` cannot be captured as it's not a real variable
`286`		`- return !isIdentifier(expression) &&`
`287`		`- expression.kind !== SyntaxKind.ThisKeyword &&`
`288`		`- expression.kind !== SyntaxKind.SuperKeyword;`
`289`		`- }`
`290`		`-`
`291`	`283`	`/**`
`292`	`284`	`* Adds super call and preceding prologue directives into the list of statements.`
`293`	`285`	`*`