Reflect control flow effects of calls to never-returning functions

ahejlsberg · ahejlsberg · commit df02ad6e59b0 · 2019-08-08T10:48:45.000+02:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1295,7 +1295,7 @@ namespace ts {
             // is potentially an assertion and is therefore included in the control flow.
             if (node.expression.kind === SyntaxKind.CallExpression) {
                 const call = <CallExpression>node.expression;
-                if (isDottedName(call.expression) && call.arguments.length >= 1) {
+                if (isDottedName(call.expression)) {
                     currentFlow = createFlowCall(currentFlow, call);
                 }
             }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -16853,31 +16853,23 @@ namespace ts {
             }
         }
 
-        function getTypePredicateForCall(node: CallExpression) {
+        function isCallWithEffects(node: CallExpression) {
             const links = getNodeLinks(node);
-            if (links.resolvedTypePredicate === undefined) {
-                links.resolvedTypePredicate = computeTypePredicateForCall(node) || noTypePredicate;
-            }
-            return links.resolvedTypePredicate === noTypePredicate ? undefined : links.resolvedTypePredicate;
-        }
-
-        function computeTypePredicateForCall(node: CallExpression) {
-            // A call expression parented by an expression statement is a potential assertion. Other call
-            // expressions are potential type predicate function calls.
-            const funcType = node.parent.kind === SyntaxKind.ExpressionStatement ? getTypeOfDottedName(node.expression) :
-                node.expression.kind !== SyntaxKind.SuperKeyword ? checkNonNullExpression(node.expression) :
-                undefined;
-            if (funcType && funcType !== silentNeverType) {
-                const apparentType = getApparentType(funcType);
-                if (some(getSignaturesOfType(apparentType, SignatureKind.Call), hasTypePredicate)) {
-                    return getTypePredicateOfSignature(getResolvedSignature(node));
-                }
+            if (links.isCallWithEffects === undefined) {
+                // A call expression parented by an expression statement is a potential assertion. Other call
+                // expressions are potential type predicate function calls.
+                const funcType = node.parent.kind === SyntaxKind.ExpressionStatement ? getTypeOfDottedName(node.expression) :
+                    node.expression.kind !== SyntaxKind.SuperKeyword ? checkNonNullExpression(node.expression) :
+                    undefined;
+                const apparentType = funcType && getApparentType(funcType) || unknownType;
+                links.isCallWithEffects = some(getSignaturesOfType(apparentType, SignatureKind.Call), hasTypePredicateOrNeverReturnType);
             }
-            return undefined;
+            return links.isCallWithEffects;
         }
 
-        function hasTypePredicate(signature: Signature) {
-            return !!getTypePredicateOfSignature(signature);
+        function hasTypePredicateOrNeverReturnType(signature: Signature) {
+            return !!(getTypePredicateOfSignature(signature) ||
+                signature.declaration && (getReturnTypeFromAnnotation(signature.declaration) || unknownType).flags & TypeFlags.Never);
         }
 
         function reportFlowControlError(node: Node) {
@@ -17094,14 +17086,20 @@ namespace ts {
             }
 
             function getTypeAtFlowCall(flow: FlowCall): FlowType | undefined {
-                const predicate = getTypePredicateForCall(flow.node);
-                if (predicate && predicate.kind === TypePredicateKind.Assertion) {
-                    const flowType = getTypeAtFlowNode(flow.antecedent);
-                    const type = getTypeFromFlowType(flowType);
-                    const narrowedType = predicate.type ?
-                        narrowTypeByTypePredicate(type, predicate, flow.node, /*assumeTrue*/ true) :
-                        narrowTypeByAssertion(type, flow.node.arguments[predicate.parameterIndex]);
-                    return narrowedType === type ? flowType : createFlowType(narrowedType, isIncomplete(flowType));
+                if (isCallWithEffects(flow.node)) {
+                    const signature = getResolvedSignature(flow.node);
+                    const predicate = getTypePredicateOfSignature(signature);
+                    if (predicate && predicate.kind === TypePredicateKind.Assertion) {
+                        const flowType = getTypeAtFlowNode(flow.antecedent);
+                        const type = getTypeFromFlowType(flowType);
+                        const narrowedType = predicate.type ?
+                            narrowTypeByTypePredicate(type, predicate, flow.node, /*assumeTrue*/ true) :
+                            narrowTypeByAssertion(type, flow.node.arguments[predicate.parameterIndex]);
+                        return narrowedType === type ? flowType : createFlowType(narrowedType, isIncomplete(flowType));
+                    }
+                    if (getReturnTypeOfSignature(signature).flags & TypeFlags.Never) {
+                        return neverType;
+                    }
                 }
                 return undefined;
             }
@@ -17690,8 +17688,9 @@ namespace ts {
             }
 
             function narrowTypeByCallExpression(type: Type, callExpression: CallExpression, assumeTrue: boolean): Type {
-                if (hasMatchingArgument(callExpression, reference)) {
-                    const predicate = getTypePredicateForCall(callExpression);
+                if (hasMatchingArgument(callExpression, reference) && isCallWithEffects(callExpression)) {
+                    const signature = getResolvedSignature(callExpression);
+                    const predicate = getTypePredicateOfSignature(signature);
                     if (predicate && predicate.kind !== TypePredicateKind.Assertion) {
                         return narrowTypeByTypePredicate(type, predicate, callExpression, assumeTrue);
                     }
@@ -23652,15 +23651,14 @@ namespace ts {
             return eachTypeContainedIn(mapType(type, getRegularTypeOfLiteralType), switchTypes);
         }
 
-        function functionHasImplicitReturn(func: FunctionLikeDeclaration) {
-            if (!(func.flags & NodeFlags.HasImplicitReturn)) {
-                return false;
-            }
+        function isNeverFunctionCall(expr: Expression) {
+            return expr.kind === SyntaxKind.CallExpression && isCallWithEffects(<CallExpression>expr) && !!(getTypeOfExpression(expr).flags & TypeFlags.Never);
+        }
 
-            if (some((<Block>func.body).statements, statement => statement.kind === SyntaxKind.SwitchStatement && isExhaustiveSwitchStatement(<SwitchStatement>statement))) {
-                return false;
-            }
-            return true;
+        function functionHasImplicitReturn(func: FunctionLikeDeclaration) {
+            return !!(func.flags & NodeFlags.HasImplicitReturn) && !some((<Block>func.body).statements, statement =>
+                statement.kind === SyntaxKind.SwitchStatement && isExhaustiveSwitchStatement(<SwitchStatement>statement) ||
+                statement.kind === SyntaxKind.ExpressionStatement && isNeverFunctionCall((<ExpressionStatement>statement).expression));
         }
 
         /** NOTE: Return value of `[]` means a different thing than `undefined`. `[]` means func returns `void`, `undefined` means it returns `never`. */
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3918,7 +3918,7 @@ namespace ts {
         resolvedSignature?: Signature;    // Cached signature of signature node or call expression
         resolvedSymbol?: Symbol;          // Cached name resolution result
         resolvedIndexInfo?: IndexInfo;    // Cached indexing info resolution result
-        resolvedTypePredicate?: TypePredicate; // Cached type predicate for call expression
+        isCallWithEffects?: boolean;      // Is call expression with possible control flow effects?
         enumMemberValue?: string | number;  // Constant value of enum member
         isVisible?: boolean;              // Is this node visible
         containsArgumentsReference?: boolean; // Whether a function-like declaration contains an 'arguments' reference

Original file line number	Diff line number	Diff line change
`@@ -1295,7 +1295,7 @@ namespace ts {`
`1295`	`1295`	`// is potentially an assertion and is therefore included in the control flow.`
`1296`	`1296`	`if (node.expression.kind === SyntaxKind.CallExpression) {`
`1297`	`1297`	`const call = <CallExpression>node.expression;`
`1298`		`- if (isDottedName(call.expression) && call.arguments.length >= 1) {`
	`1298`	`+ if (isDottedName(call.expression)) {`
`1299`	`1299`	`currentFlow = createFlowCall(currentFlow, call);`
`1300`	`1300`	`}`
`1301`	`1301`	`}`