microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-09-19 04:07:36 +03:00
Code Issues Projects Releases Wiki Activity

Added another optimization that limits number of recursive calls to getTypeFromFlowNode, a limit that is hit only in very complex untyped functions.

Browse Source
This commit is contained in:
Eric Traut 2021-09-15 20:57:56 -07:00
parent 809594e357
commit 234d990d71
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/pyright-internal/src/analyzer/typeEvaluator.ts
View File

@ -760,6 +760,10 @@ const maxOverloadUnionExpansionCount = 64;
// with incomplete results before we give up.
const maxFlowNodeLoopVisitCount = 64;
// Maximum number of times getTypeFromFlowNode can be called
// recursively within loop or branch processing before we give up.
const maxCodeFlowInvocationsPerLoop = 16 * 1024;
export interface EvaluatorOptions {
disableInferenceForPyTypedSources: boolean;
printTypeFlags: TypePrinter.PrintTypeFlags;
@ -785,6 +789,7 @@ export function createTypeEvaluator(
const suppressedNodeStack: ParseNode[] = [];
const incompleteTypeTracker = new IncompleteTypeTracker();
let cancellationToken: CancellationToken | undefined;
let codeFlowInvocations = 0;
let flowIncompleteGeneration = 1;
let isBasicTypesInitialized = false;
let noneType: Type | undefined;
@ -17706,6 +17711,10 @@ export function createTypeEvaluator(
let curFlowNode = flowNode;
let usedOuterScopeAlias = false;
// Record how many times this function has been called.
const codeFlowInvocationsAtStart = codeFlowInvocations;
codeFlowInvocations++;
// This is a frequently-called routine, so it's a good place to call
// the cancellation check. If the operation is canceled, an exception
// will be thrown at this point.
@ -17890,6 +17899,14 @@ export function createTypeEvaluator(
const effectiveType =
!!reference || typesToCombine.length > 0 ? combineTypes(typesToCombine) : undefined;
// Limit the number of recursive calls before we give up and call the type
// complete. This can theoretically result in incorrect type information in
// very complex code flows, but it's preferable to extremely long analysis times.
if (codeFlowInvocations - codeFlowInvocationsAtStart > maxCodeFlowInvocationsPerLoop) {
sawIncomplete = false;
}
return setCacheEntry(curFlowNode, effectiveType, branchUsedOuterScopeAlias, sawIncomplete);
}
@ -18004,11 +18021,18 @@ export function createTypeEvaluator(
// and some of the subtypes are still incomplete, bail and base the
// isIncomplete flag on the first subtype, which is the one that feeds
// the top of the loop.
const isIncomplete =
let isIncomplete =
visitCount >= maxFlowNodeLoopVisitCount
? cacheEntry.incompleteSubtypes![0].isIncomplete
: reference !== undefined;
// Limit the number of recursive calls before we give up and call the type
// complete. This can theoretically result in incorrect type information in
// very complex code flows, but it's preferable to extremely long analysis times.
if (codeFlowInvocations - codeFlowInvocationsAtStart > maxCodeFlowInvocationsPerLoop) {
isIncomplete = false;
}
return {
type: cacheEntry.type,
usedOuterScopeAlias,