@zzzen/pyright-internal 1.2.0-dev.2022-07-02 → 1.2.0-dev.20220717

package/dist/analyzer/typeEvaluator.js

@@ -182,6 +182,9 @@ const maxReturnTypeInferenceArgumentCount = 6;
 // when its parameters are unannotated? We want to keep this
 // pretty low because this can be very costly.
 const maxReturnTypeInferenceCodeFlowComplexity = 8;
+// What is the max number of return types cached per function
+// when using call-site inference?
+const maxCallSiteReturnTypeCacheSize = 8;
 // How many entries in a list, set, or dict should we examine
 // when inferring the type? We need to cut it off at some point
 // to avoid excessive computation.
@@ -209,7 +212,7 @@ const maxLiteralMathSubtypeCount = 64;
 // off code flow analysis at some point for code flow graphs that are too
 // complex. Otherwise we risk overflowing the stack or incurring extremely
 // long analysis times. This number has been tuned empirically.
-exports.maxCodeComplexity = 1024;
+exports.maxCodeComplexity = 768;
 function createTypeEvaluator(importLookup, evaluatorOptions) {
     const symbolResolutionStack = [];
     const typeCacheFlags = new Map();
@@ -231,6 +234,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     let functionObj;
     let tupleClassType;
     let boolClassType;
+    let intClassType;
     let strClassType;
     let dictClassType;
     let typedDictClassType;
@@ -452,6 +456,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             noneType = getTypeshedType(node, 'NoneType') || types_1.AnyType.create();
             tupleClassType = getBuiltInType(node, 'tuple');
             boolClassType = getBuiltInType(node, 'bool');
+            intClassType = getBuiltInType(node, 'int');
             strClassType = getBuiltInType(node, 'str');
             dictClassType = getBuiltInType(node, 'dict');
             typedDictClassType = getTypingType(node, '_TypedDict');
@@ -660,15 +665,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 typeResult.type.details.illegalRecursionDetected = true;
             }
         }
-        // Don't update the type cache with an unbound type that results from
-        // a resolution cycle. The cache will be updated when the stack unwinds
-        // and the type is fully evaluated.
-        if (!(0, typeUtils_1.isTypeAliasPlaceholder)(typeResult.type)) {
-            writeTypeCache(node, typeResult.type, flags, !!typeResult.isIncomplete, expectedType, 
-            /* allowSpeculativeCaching */ true);
-            if (expectedType && !(0, types_1.isAnyOrUnknown)(expectedType) && !(0, types_1.isNever)(expectedType)) {
-                expectedTypeCache.set(node.id, expectedType);
-            }
+        writeTypeCache(node, typeResult.type, flags, !!typeResult.isIncomplete, expectedType, 
+        /* allowSpeculativeCaching */ true);
+        if (expectedType && !(0, types_1.isAnyOrUnknown)(expectedType) && !(0, types_1.isNever)(expectedType)) {
+            expectedTypeCache.set(node.id, expectedType);
         }
         if (printExpressionTypes) {
             printExpressionSpaceCount--;
@@ -920,7 +920,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const argList = [
             {
                 argumentCategory: 0 /* Simple */,
-                type: functionOrClassType,
+                typeResult: { type: functionOrClassType },
             },
         ];
         const returnType = validateCallArguments(node.expression, argList, decoratorTypeResult, 
@@ -1235,7 +1235,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         function addFakeArg() {
             argList.push({
                 argumentCategory: previousCategory,
-                type: types_1.UnknownType.create(),
+                typeResult: { type: types_1.UnknownType.create() },
                 active: true,
             });
         }
@@ -1277,10 +1277,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 addOneFunctionToSignature(type);
             }
             else {
-                type.overloads.forEach((func) => {
-                    if (types_1.FunctionType.isOverloaded(func)) {
-                        addOneFunctionToSignature(func);
-                    }
+                types_1.OverloadedFunctionType.getOverloads(type).forEach((func) => {
+                    addOneFunctionToSignature(func);
                 });
             }
         }
@@ -1368,7 +1366,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // Handle the case where the symbol is a class-level variable
                     // where the type isn't declared in this class but is in
                     // a parent class.
-                    if (getDeclaredTypeOfSymbol(symbol) === undefined &&
+                    if (getDeclaredTypeOfSymbol(symbol, expression) === undefined &&
                         symbolWithScope.scope.type === 2 /* Class */) {
                         const enclosingClass = ParseTreeUtils.getEnclosingClassOrFunction(expression);
                         if (enclosingClass && enclosingClass.nodeType === 10 /* Class */) {
@@ -1386,7 +1384,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 break;
             }
             case 54 /* TypeAnnotation */: {
-                return getDeclaredTypeForExpression(expression.valueExpression);
+                return getDeclaredTypeForExpression(expression.valueExpression, usage);
             }
             case 35 /* MemberAccess */: {
                 const baseType = makeTopLevelTypeVarsConcrete(getTypeOfExpression(expression.leftExpression, 2 /* DoNotSpecialize */).type);
@@ -1482,13 +1480,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 return subtype;
             }
             if ((0, types_1.isClassInstance)(subtype)) {
-                const awaitReturnType = getSpecializedReturnType(subtype, '__await__', errorNode);
+                const awaitReturnType = getSpecializedReturnType(subtype, '__await__', [], errorNode);
                 if (awaitReturnType) {
                     if ((0, types_1.isAnyOrUnknown)(awaitReturnType)) {
                         return awaitReturnType;
                     }
                     if ((0, types_1.isClassInstance)(awaitReturnType)) {
-                        const iterReturnType = getSpecializedReturnType(awaitReturnType, '__iter__', errorNode);
+                        const iterReturnType = getSpecializedReturnType(awaitReturnType, '__iter__', [], errorNode);
                         if (iterReturnType) {
                             const generatorReturnType = getReturnTypeFromGenerator(awaitReturnType);
                             if (generatorReturnType) {
@@ -1533,18 +1531,27 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         subtype.tupleTypeArguments.length === 0) {
                         return types_1.NeverType.createNever();
                     }
-                    iterReturnType = getSpecializedReturnType(subtype, iterMethodName, errorNode);
+                    iterReturnType = getSpecializedReturnType(subtype, iterMethodName, [], errorNode);
                 }
                 else if (types_1.TypeBase.isInstantiable(subtype) &&
                     subtype.details.effectiveMetaclass &&
                     (0, types_1.isInstantiableClass)(subtype.details.effectiveMetaclass)) {
-                    iterReturnType = getSpecializedReturnType(types_1.ClassType.cloneAsInstance(subtype.details.effectiveMetaclass), iterMethodName, errorNode, subtype);
+                    iterReturnType = getSpecializedReturnType(types_1.ClassType.cloneAsInstance(subtype.details.effectiveMetaclass), iterMethodName, [], errorNode, subtype);
                 }
                 if (!iterReturnType) {
                     // There was no __iter__. See if we can fall back to
                     // the __getitem__ method instead.
-                    if ((0, types_1.isClassInstance)(subtype)) {
-                        const getItemReturnType = getSpecializedReturnType(subtype, '__getitem__', errorNode);
+                    if (!isAsync && (0, types_1.isClassInstance)(subtype)) {
+                        const getItemReturnType = getSpecializedReturnType(subtype, '__getitem__', [
+                            {
+                                argumentCategory: 0 /* Simple */,
+                                typeResult: {
+                                    type: intClassType && (0, types_1.isInstantiableClass)(intClassType)
+                                        ? types_1.ClassType.cloneAsInstance(intClassType)
+                                        : types_1.UnknownType.create(),
+                                },
+                            },
+                        ], errorNode);
                         if (getItemReturnType) {
                             return getItemReturnType;
                         }
@@ -1559,7 +1566,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             return subtype;
                         }
                         if ((0, types_1.isClassInstance)(subtype)) {
-                            const nextReturnType = getSpecializedReturnType(subtype, nextMethodName, errorNode);
+                            const nextReturnType = getSpecializedReturnType(subtype, nextMethodName, [], errorNode);
                             if (!nextReturnType) {
                                 iterReturnTypeDiag.addMessage(localize_1.Localizer.Diagnostic.methodNotDefinedOnType().format({
                                     name: nextMethodName,
@@ -1612,12 +1619,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if ((0, types_1.isClass)(subtype)) {
                 let iterReturnType;
                 if (types_1.TypeBase.isInstance(subtype)) {
-                    iterReturnType = getSpecializedReturnType(subtype, iterMethodName, errorNode);
+                    iterReturnType = getSpecializedReturnType(subtype, iterMethodName, [], errorNode);
                 }
                 else if (types_1.TypeBase.isInstantiable(subtype) &&
                     subtype.details.effectiveMetaclass &&
                     (0, types_1.isInstantiableClass)(subtype.details.effectiveMetaclass)) {
-                    iterReturnType = getSpecializedReturnType(types_1.ClassType.cloneAsInstance(subtype.details.effectiveMetaclass), iterMethodName, errorNode, subtype);
+                    iterReturnType = getSpecializedReturnType(types_1.ClassType.cloneAsInstance(subtype.details.effectiveMetaclass), iterMethodName, [], errorNode, subtype);
                 }
                 if (iterReturnType) {
                     return makeTopLevelTypeVarsConcrete(iterReturnType);
@@ -1765,6 +1772,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             fileInfo.diagnosticSink.addUnusedCodeWithTextRange(localize_1.Localizer.Diagnostic.unreachableCode(), textRange);
         }
     }
+    function addUnreachableCode(node, textRange) {
+        if (!isDiagnosticSuppressedForNode(node)) {
+            const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+            fileInfo.diagnosticSink.addUnreachableCodeWithTextRange(localize_1.Localizer.Diagnostic.unreachableCode(), textRange);
+        }
+    }
     function addDeprecated(message, node) {
         if (!isDiagnosticSuppressedForNode(node)) {
             const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
@@ -2519,7 +2532,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return undefined;
     }
-    function getSpecializedReturnType(objType, memberName, errorNode, bindToClass) {
+    function getSpecializedReturnType(objType, memberName, argList, errorNode, bindToClass) {
         const classMember = (0, typeUtils_1.lookUpObjectMember)(objType, memberName, 8 /* SkipInstanceVariables */);
         if (!classMember) {
             return undefined;
@@ -2528,21 +2541,32 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, types_1.isAnyOrUnknown)(memberType)) {
             return memberType;
         }
-        if ((0, types_1.isFunction)(memberType)) {
+        if ((0, types_1.isFunction)(memberType) || (0, types_1.isOverloadedFunction)(memberType)) {
             const methodType = bindFunctionToClassOrObject(bindToClass || objType, memberType, classMember && (0, types_1.isInstantiableClass)(classMember.classType) ? classMember.classType : undefined, errorNode, 
             /* recursionCount */ undefined, 
             /* treatConstructorAsClassMember */ false, 
             /* firstParamType */ bindToClass);
             if (methodType) {
-                return getFunctionEffectiveReturnType(methodType);
+                if ((0, types_1.isOverloadedFunction)(methodType)) {
+                    if (errorNode) {
+                        const bestOverload = getBestOverloadForArguments(errorNode, methodType, argList);
+                        if (bestOverload) {
+                            return getFunctionEffectiveReturnType(bestOverload);
+                        }
+                    }
+                }
+                else {
+                    return getFunctionEffectiveReturnType(methodType);
+                }
             }
         }
         return undefined;
     }
     function getTypeOfName(node, flags) {
-        var _a;
+        var _a, _b;
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         const name = node.value;
+        let symbol;
         let type;
         let isIncomplete = false;
         const allowForwardReferences = (flags & 4 /* AllowForwardReferences */) !== 0 || fileInfo.isStubFile;
@@ -2556,96 +2580,104 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 };
             }
         }
-        // Look for the scope that contains the value definition and
-        // see if it has a declared type.
-        const symbolWithScope = lookUpSymbolRecursive(node, name, !allowForwardReferences, allowForwardReferences && (flags & 1024 /* ExpectingTypeAnnotation */) !== 0);
-        if (symbolWithScope) {
-            let useCodeFlowAnalysis = !allowForwardReferences;
-            // If the symbol is implicitly imported from the builtin
-            // scope, there's no need to use code flow analysis.
-            if (symbolWithScope.scope.type === 4 /* Builtin */) {
-                useCodeFlowAnalysis = false;
-            }
-            const symbol = symbolWithScope.symbol;
-            // Get the effective type (either the declared type or the inferred type).
-            // If we're using code flow analysis, pass the usage node so we consider
-            // only the assignment nodes that are reachable from this usage.
-            const effectiveTypeInfo = getEffectiveTypeOfSymbolForUsage(symbol, useCodeFlowAnalysis ? node : undefined);
-            let effectiveType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(effectiveTypeInfo.type);
-            if (effectiveTypeInfo.isIncomplete) {
-                if ((0, types_1.isUnbound)(effectiveType)) {
-                    effectiveType = types_1.UnknownType.create(/* isIncomplete */ true);
-                }
-                isIncomplete = true;
-            }
-            if (effectiveTypeInfo.isRecursiveDefinition && isNodeReachable(node)) {
-                addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.recursiveDefinition().format({ name }), node);
-            }
-            const isSpecialBuiltIn = !!effectiveType && (0, types_1.isInstantiableClass)(effectiveType) && types_1.ClassType.isSpecialBuiltIn(effectiveType);
-            type = effectiveType;
-            if (useCodeFlowAnalysis && !isSpecialBuiltIn) {
-                // See if code flow analysis can tell us anything more about the type.
-                // If the symbol is declared outside of our execution scope, use its effective
-                // type. If it's declared inside our execution scope, it generally starts
-                // as unbound at the start of the code flow.
-                const typeAtStart = symbolWithScope.isBeyondExecutionScope || !symbol.isInitiallyUnbound()
-                    ? effectiveType
-                    : types_1.UnboundType.create();
-                const codeFlowTypeResult = getFlowTypeOfReference(node, symbol.id, typeAtStart, 
-                /* isInitialTypeIncomplete */ false, 
-                /* startNode */ undefined);
-                if (codeFlowTypeResult.type) {
-                    type = codeFlowTypeResult.type;
-                }
-                if (codeFlowTypeResult.isIncomplete) {
+        const typeParamSymbol = AnalyzerNodeInfo.getTypeParameterSymbol(node);
+        if (typeParamSymbol) {
+            symbol = typeParamSymbol;
+            type = (_a = getDeclaredTypeOfSymbol(typeParamSymbol)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+            setSymbolAccessed(fileInfo, symbol, node);
+        }
+        else {
+            // Look for the scope that contains the value definition and
+            // see if it has a declared type.
+            const symbolWithScope = lookUpSymbolRecursive(node, name, !allowForwardReferences, allowForwardReferences && (flags & 1024 /* ExpectingTypeAnnotation */) !== 0);
+            if (symbolWithScope) {
+                let useCodeFlowAnalysis = !allowForwardReferences;
+                // If the symbol is implicitly imported from the builtin
+                // scope, there's no need to use code flow analysis.
+                if (symbolWithScope.scope.type === 4 /* Builtin */) {
+                    useCodeFlowAnalysis = false;
+                }
+                symbol = symbolWithScope.symbol;
+                // Get the effective type (either the declared type or the inferred type).
+                // If we're using code flow analysis, pass the usage node so we consider
+                // only the assignment nodes that are reachable from this usage.
+                const effectiveTypeInfo = getEffectiveTypeOfSymbolForUsage(symbol, useCodeFlowAnalysis ? node : undefined);
+                let effectiveType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(effectiveTypeInfo.type);
+                if (effectiveTypeInfo.isIncomplete) {
+                    if ((0, types_1.isUnbound)(effectiveType)) {
+                        effectiveType = types_1.UnknownType.create(/* isIncomplete */ true);
+                    }
                     isIncomplete = true;
                 }
-                if (!codeFlowTypeResult.type && symbolWithScope.isBeyondExecutionScope) {
-                    const outerScopeTypeResult = getCodeFlowTypeForCapturedVariable(node, symbolWithScope, effectiveType);
-                    if (outerScopeTypeResult === null || outerScopeTypeResult === void 0 ? void 0 : outerScopeTypeResult.type) {
-                        type = outerScopeTypeResult.type;
-                    }
-                    if (outerScopeTypeResult === null || outerScopeTypeResult === void 0 ? void 0 : outerScopeTypeResult.isIncomplete) {
+                if (effectiveTypeInfo.isRecursiveDefinition && isNodeReachable(node)) {
+                    addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.recursiveDefinition().format({ name }), node);
+                }
+                const isSpecialBuiltIn = !!effectiveType && (0, types_1.isInstantiableClass)(effectiveType) && types_1.ClassType.isSpecialBuiltIn(effectiveType);
+                type = effectiveType;
+                if (useCodeFlowAnalysis && !isSpecialBuiltIn) {
+                    // See if code flow analysis can tell us anything more about the type.
+                    // If the symbol is declared outside of our execution scope, use its effective
+                    // type. If it's declared inside our execution scope, it generally starts
+                    // as unbound at the start of the code flow.
+                    const typeAtStart = symbolWithScope.isBeyondExecutionScope || !symbol.isInitiallyUnbound()
+                        ? effectiveType
+                        : types_1.UnboundType.create();
+                    const codeFlowTypeResult = getFlowTypeOfReference(node, symbol.id, typeAtStart, 
+                    /* isInitialTypeIncomplete */ false, 
+                    /* startNode */ undefined);
+                    if (codeFlowTypeResult.type) {
+                        type = codeFlowTypeResult.type;
+                    }
+                    if (codeFlowTypeResult.isIncomplete) {
                         isIncomplete = true;
                     }
+                    if (!codeFlowTypeResult.type && symbolWithScope.isBeyondExecutionScope) {
+                        const outerScopeTypeResult = getCodeFlowTypeForCapturedVariable(node, symbolWithScope, effectiveType);
+                        if (outerScopeTypeResult === null || outerScopeTypeResult === void 0 ? void 0 : outerScopeTypeResult.type) {
+                            type = outerScopeTypeResult.type;
+                        }
+                        if (outerScopeTypeResult === null || outerScopeTypeResult === void 0 ? void 0 : outerScopeTypeResult.isIncomplete) {
+                            isIncomplete = true;
+                        }
+                    }
                 }
-            }
-            // Detect, report, and fill in missing type arguments if appropriate.
-            type = reportMissingTypeArguments(node, type, flags);
-            setSymbolAccessed(fileInfo, symbol, node);
-            if ((flags & 1024 /* ExpectingTypeAnnotation */) !== 0) {
-                // Verify that the name does not refer to a (non type alias) variable.
-                if (effectiveTypeInfo.includesVariableDecl && !type.typeAliasInfo) {
-                    let isAllowedTypeForVariable = (0, types_1.isTypeVar)(type) || (0, typeUtils_1.isTypeAliasPlaceholder)(type);
-                    if ((0, types_1.isClass)(type) && !type.includeSubclasses) {
-                        // This check exempts class types that are created by calling
-                        // NewType, NamedTuple, and by invoking a metaclass directly.
-                        isAllowedTypeForVariable = true;
-                    }
-                    // Disable for assignments in the typings.pyi file, since it defines special forms.
-                    if (!isAllowedTypeForVariable && !fileInfo.isTypingStubFile) {
-                        // This might be a union that was previously a type alias
-                        // but was reconstituted in such a way that we lost the
-                        // typeAliasInfo. Avoid the false positive error by suppressing
-                        // the error when it looks like a plausible type alias type.
-                        if (effectiveTypeInfo.includesIllegalTypeAliasDecl ||
-                            !types_1.TypeBase.isInstantiable(type) ||
-                            (flags & 2 /* DoNotSpecialize */) !== 0) {
-                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAnnotationVariable(), node);
-                            type = types_1.UnknownType.create();
+                // Detect, report, and fill in missing type arguments if appropriate.
+                type = reportMissingTypeArguments(node, type, flags);
+                setSymbolAccessed(fileInfo, symbol, node);
+                if ((flags & 1024 /* ExpectingTypeAnnotation */) !== 0) {
+                    // Verify that the name does not refer to a (non type alias) variable.
+                    if (effectiveTypeInfo.includesVariableDecl && !type.typeAliasInfo) {
+                        let isAllowedTypeForVariable = (0, types_1.isTypeVar)(type) || (0, typeUtils_1.isTypeAliasPlaceholder)(type);
+                        if ((0, types_1.isClass)(type) && !type.includeSubclasses) {
+                            // This check exempts class types that are created by calling
+                            // NewType, NamedTuple, and by invoking a metaclass directly.
+                            isAllowedTypeForVariable = true;
+                        }
+                        // Disable for assignments in the typings.pyi file, since it defines special forms.
+                        if (!isAllowedTypeForVariable && !fileInfo.isTypingStubFile) {
+                            // This might be a union that was previously a type alias
+                            // but was reconstituted in such a way that we lost the
+                            // typeAliasInfo. Avoid the false positive error by suppressing
+                            // the error when it looks like a plausible type alias type.
+                            if (effectiveTypeInfo.includesIllegalTypeAliasDecl ||
+                                !types_1.TypeBase.isInstantiable(type) ||
+                                (flags & 2 /* DoNotSpecialize */) !== 0) {
+                                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAnnotationVariable(), node);
+                                type = types_1.UnknownType.create();
+                            }
                         }
                     }
                 }
             }
-        }
-        else {
-            // Handle the special case of "reveal_type" and "reveal_locals".
-            if (name === 'reveal_type' || name === 'reveal_locals') {
-                type = types_1.AnyType.create();
-            }
             else {
-                addDiagnostic(fileInfo.diagnosticRuleSet.reportUndefinedVariable, diagnosticRules_1.DiagnosticRule.reportUndefinedVariable, localize_1.Localizer.Diagnostic.symbolIsUndefined().format({ name }), node);
-                type = types_1.UnknownType.create();
+                // Handle the special case of "reveal_type" and "reveal_locals".
+                if (name === 'reveal_type' || name === 'reveal_locals') {
+                    type = types_1.AnyType.create();
+                }
+                else {
+                    addDiagnostic(fileInfo.diagnosticRuleSet.reportUndefinedVariable, diagnosticRules_1.DiagnosticRule.reportUndefinedVariable, localize_1.Localizer.Diagnostic.symbolIsUndefined().format({ name }), node);
+                    type = types_1.UnknownType.create();
+                }
             }
         }
         if ((0, types_1.isParamSpec)(type)) {
@@ -2660,7 +2692,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             type.details.name === name) {
             // Handle the special case of a PEP 604 union. These can appear within
             // an implied type alias where we are not expecting a type.
-            const isPep604Union = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 7 /* BinaryOperation */ &&
+            const isPep604Union = ((_b = node.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 7 /* BinaryOperation */ &&
                 node.parent.operator === 6 /* BitwiseOr */;
             if (!isPep604Union) {
                 // A TypeVar in contexts where we're not expecting a type is
@@ -2748,6 +2780,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             type = scopedTypeVarInfo.type;
             if ((flags & 2048 /* DisallowTypeVarsWithScopeId */) !== 0 && type.scopeId !== undefined) {
                 if (!type.details.isSynthesized && !type.details.isParamSpec) {
+                    // This TypeVar already has a scope ID assigned to it. See if it
+                    // originates from type parameter syntax. If so, allow it.
+                    if (type.details.isTypeParamSyntax) {
+                        return type;
+                    }
+                    // If this type variable expression is used within a generic class,
+                    // function, or type alias that uses type parameter syntax, there is
+                    // no need to report an error here.
+                    const typeVarScopeNode = ParseTreeUtils.getTypeVarScopeNode(node);
+                    if (typeVarScopeNode &&
+                        typeVarScopeNode.typeParameters &&
+                        !typeVarScopeNode.typeParameters.parameters.some((t) => t.name === node)) {
+                        return type;
+                    }
                     addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeVarUsedByOuterScope().format({ name: type.details.name }), node);
                 }
             }
@@ -2773,6 +2819,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             }
                         }
                         if (enclosingScope) {
+                            // If the enclosing scope is using type parameter syntax, traditional
+                            // type variables can't be used in this context.
+                            if (enclosingScope.typeParameters) {
+                                addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeParameterNotDeclared().format({
+                                    name: type.details.name,
+                                    container: enclosingScope.name.value,
+                                }), node);
+                            }
                             type = types_1.TypeVarType.cloneForScopeId(type, getScopeIdForNode(enclosingScope), enclosingScope.name.value, enclosingScope.nodeType === 28 /* Function */
                                 ? 1 /* Function */
                                 : 0 /* Class */);
@@ -2866,50 +2920,48 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // Walks up the parse tree to find a function, class, or type alias
     // assignment that provides the context for a type variable.
     function findScopedTypeVar(node, type) {
-        var _a;
         let curNode = node;
         let nestedClassCount = 0;
         (0, debug_1.assert)(types_1.TypeBase.isInstantiable(type));
         while (curNode) {
-            // Generally, getTypeVarScopeNode should not include the function
-            // that contains the TypeVar in its signature, but we make an exception
-            // for TypeVars that are used in a member access expression to accommodate
-            // ParamSpecs (P.args and P.kwargs).
-            curNode = ParseTreeUtils.getTypeVarScopeNode(curNode, ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 35 /* MemberAccess */);
+            curNode = ParseTreeUtils.getTypeVarScopeNode(curNode);
             if (!curNode) {
                 break;
             }
-            let typeVarsForScope;
+            let typeParametersForScope;
+            let scopeUsesTypeParameterSyntax = false;
             if (curNode.nodeType === 10 /* Class */) {
                 const classTypeInfo = getTypeOfClass(curNode);
-                if (classTypeInfo) {
-                    typeVarsForScope = classTypeInfo.classType.details.typeParameters;
+                if (classTypeInfo && !types_1.ClassType.isPartiallyEvaluated(classTypeInfo.classType)) {
+                    typeParametersForScope = classTypeInfo.classType.details.typeParameters;
                 }
+                scopeUsesTypeParameterSyntax = !!curNode.typeParameters;
                 nestedClassCount++;
             }
             else if (curNode.nodeType === 28 /* Function */) {
                 const functionTypeInfo = getTypeOfFunction(curNode);
                 if (functionTypeInfo) {
-                    typeVarsForScope = [];
+                    typeParametersForScope = [];
                     functionTypeInfo.functionType.details.parameters.forEach((param) => {
                         if (param.hasDeclaredType) {
-                            (0, typeUtils_1.addTypeVarsToListIfUnique)(typeVarsForScope, (0, typeUtils_1.getTypeVarArgumentsRecursive)(param.type));
+                            (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersForScope, (0, typeUtils_1.getTypeVarArgumentsRecursive)(param.type));
                         }
                     });
                     if (functionTypeInfo.functionType.details.declaredReturnType) {
-                        (0, typeUtils_1.addTypeVarsToListIfUnique)(typeVarsForScope, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionTypeInfo.functionType.details.declaredReturnType));
+                        (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParametersForScope, (0, typeUtils_1.getTypeVarArgumentsRecursive)(functionTypeInfo.functionType.details.declaredReturnType));
                     }
                 }
+                scopeUsesTypeParameterSyntax = !!curNode.typeParameters;
             }
-            else if (curNode.nodeType === 36 /* Module */) {
-                break;
+            else if (curNode.nodeType === 77 /* TypeAlias */) {
+                scopeUsesTypeParameterSyntax = !!curNode.typeParameters;
             }
-            if (typeVarsForScope) {
-                const match = typeVarsForScope.find((typeVar) => typeVar.details.name === type.details.name);
+            if (typeParametersForScope) {
+                const match = typeParametersForScope.find((typeVar) => typeVar.details.name === type.details.name);
                 if (match === null || match === void 0 ? void 0 : match.scopeId) {
                     // Use the scoped version of the TypeVar rather than the (unscoped) original type.
                     type = types_1.TypeVarType.cloneForScopeId(type, match.scopeId, match.scopeName, match.scopeType);
-                    return { type, foundInterveningClass: nestedClassCount > 1 };
+                    return { type, foundInterveningClass: nestedClassCount > 1 && !scopeUsesTypeParameterSyntax };
                 }
             }
             curNode = curNode.parent;
@@ -2917,14 +2969,29 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // See if this is part of an assignment statement that is defining a type alias.
         curNode = node;
         while (curNode) {
-            if (curNode.nodeType === 3 /* Assignment */) {
-                const leftType = readTypeCache(curNode.leftExpression, 0 /* None */);
+            let leftType;
+            let typeAliasNode = undefined;
+            if (curNode.nodeType === 77 /* TypeAlias */) {
+                leftType = readTypeCache(curNode.name, 0 /* None */);
+                typeAliasNode = curNode;
+            }
+            else if (curNode.nodeType === 3 /* Assignment */) {
+                leftType = readTypeCache(curNode.leftExpression, 0 /* None */);
+            }
+            if (leftType) {
                 // Is this a placeholder that was temporarily written to the cache for
                 // purposes of resolving type aliases?
                 if (leftType &&
                     (0, types_1.isTypeVar)(leftType) &&
                     leftType.details.recursiveTypeAliasScopeId &&
                     leftType.details.recursiveTypeAliasName) {
+                    // Type alias statements cannot be used with old-style type variables.
+                    if (typeAliasNode && !type.details.isTypeParamSyntax) {
+                        addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeParameterNotDeclared().format({
+                            name: type.details.name,
+                            container: typeAliasNode.name.value,
+                        }), node);
+                    }
                     return {
                         type: types_1.TypeVarType.cloneForScopeId(type, leftType.details.recursiveTypeAliasScopeId, leftType.details.recursiveTypeAliasName, 2 /* TypeAlias */),
                         foundInterveningClass: false,
@@ -3530,25 +3597,27 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             {
                                 // Provide "obj" argument.
                                 argumentCategory: 0 /* Simple */,
-                                type: types_1.ClassType.isClassProperty(lookupClass)
-                                    ? baseTypeClass
-                                    : isAccessedThroughObject
-                                        ? bindToType || types_1.ClassType.cloneAsInstance(baseTypeClass)
-                                        : types_1.NoneType.createInstance(),
+                                typeResult: {
+                                    type: types_1.ClassType.isClassProperty(lookupClass)
+                                        ? baseTypeClass
+                                        : isAccessedThroughObject
+                                            ? bindToType || types_1.ClassType.cloneAsInstance(baseTypeClass)
+                                            : types_1.NoneType.createInstance(),
+                                },
                             },
                         ];
                         if (usage.method === 'get') {
                             // Provide "objtype" argument.
                             argList.push({
                                 argumentCategory: 0 /* Simple */,
-                                type: baseTypeClass,
+                                typeResult: { type: baseTypeClass },
                             });
                         }
                         else if (usage.method === 'set') {
                             // Provide "value" argument.
                             argList.push({
                                 argumentCategory: 0 /* Simple */,
-                                type: (_a = usage.setType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create(),
+                                typeResult: { type: (_a = usage.setType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create() },
                             });
                         }
                         if (types_1.ClassType.isPropertyClass(lookupClass) &&
@@ -3660,7 +3729,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         isFinal = types_1.FunctionType.isFinal(concreteSubtype);
                     }
                     else {
-                        const impl = concreteSubtype.overloads.find((f) => !types_1.FunctionType.isOverloaded(f));
+                        const impl = types_1.OverloadedFunctionType.getImplementation(concreteSubtype);
                         if (impl) {
                             isFinal = types_1.FunctionType.isFinal(impl);
                         }
@@ -3782,55 +3851,57 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     // Applies the __getattr__, __setattr__ or __delattr__ method if present.
     function applyAttributeAccessOverride(classType, errorNode, usage, memberName) {
-        var _a, _b, _c, _d;
-        if (usage.method === 'get') {
+        var _a, _b, _c;
+        const getAttributeAccessMember = (name) => {
+            var _a;
             // See if the class has a "__getattribute__" or "__getattr__" method.
             // If so, arbitrary members are supported.
-            let getAttrType = (_a = getTypeOfClassMember(errorNode, classType, '__getattribute__', { method: 'get' }, 
+            return (_a = getTypeOfClassMember(errorNode, classType, name, { method: 'get' }, 
             /* diag */ undefined, 4 /* SkipObjectBaseClass */ | 64 /* SkipAttributeAccessOverride */)) === null || _a === void 0 ? void 0 : _a.type;
-            if (!getAttrType) {
-                getAttrType = (_b = getTypeOfClassMember(errorNode, classType, '__getattr__', { method: 'get' }, 
-                /* diag */ undefined, 4 /* SkipObjectBaseClass */ | 64 /* SkipAttributeAccessOverride */)) === null || _b === void 0 ? void 0 : _b.type;
-            }
-            // If it's an overload, it might be based on the member name. Create
-            // a literal str type based on the member name and find the best overload.
-            if (getAttrType && (0, types_1.isOverloadedFunction)(getAttrType)) {
-                let nameLiteralType = types_1.AnyType.create();
-                if (strClassType && (0, types_1.isInstantiableClass)(strClassType)) {
-                    nameLiteralType = types_1.ClassType.cloneWithLiteral(types_1.ClassType.cloneAsInstance(strClassType), memberName);
-                }
-                getAttrType = getBestOverloadForArguments(errorNode, getAttrType, [
-                    {
-                        argumentCategory: 0 /* Simple */,
-                        type: types_1.AnyType.create(),
-                    },
-                    {
-                        argumentCategory: 0 /* Simple */,
-                        type: nameLiteralType,
-                    },
-                ]);
-            }
-            if (getAttrType && (0, types_1.isFunction)(getAttrType)) {
-                return getFunctionEffectiveReturnType(getAttrType);
-            }
+        };
+        let accessMemberType;
+        if (usage.method === 'get') {
+            accessMemberType = (_a = getAttributeAccessMember('__getattribute__')) !== null && _a !== void 0 ? _a : getAttributeAccessMember('__getattr__');
         }
         else if (usage.method === 'set') {
-            const setAttrType = (_c = getTypeOfClassMember(errorNode, classType, '__setattr__', { method: 'get' }, 
-            /* diag */ undefined, 4 /* SkipObjectBaseClass */ | 64 /* SkipAttributeAccessOverride */)) === null || _c === void 0 ? void 0 : _c.type;
-            if (setAttrType) {
-                // The type doesn't matter for a set usage. We just need
-                // to return a defined type.
-                return types_1.AnyType.create();
-            }
+            accessMemberType = getAttributeAccessMember('__setattr__');
         }
         else {
             (0, debug_1.assert)(usage.method === 'del');
-            const delAttrType = (_d = getTypeOfClassMember(errorNode, classType, '__detattr__', { method: 'get' }, 
-            /* diag */ undefined, 4 /* SkipObjectBaseClass */ | 64 /* SkipAttributeAccessOverride */)) === null || _d === void 0 ? void 0 : _d.type;
-            if (delAttrType) {
-                // The type doesn't matter for a delete usage. We just need
-                // to return a defined type.
-                return types_1.AnyType.create();
+            accessMemberType = getAttributeAccessMember('__delattr__');
+        }
+        if (accessMemberType) {
+            let nameLiteralType = types_1.AnyType.create();
+            if (strClassType && (0, types_1.isInstantiableClass)(strClassType)) {
+                nameLiteralType = types_1.ClassType.cloneWithLiteral(types_1.ClassType.cloneAsInstance(strClassType), memberName);
+            }
+            const argList = [
+                {
+                    // Provide "self" argument.
+                    argumentCategory: 0 /* Simple */,
+                    typeResult: { type: types_1.ClassType.cloneAsInstance(classType) },
+                },
+                {
+                    // Provide "name" argument.
+                    argumentCategory: 0 /* Simple */,
+                    typeResult: { type: nameLiteralType },
+                },
+            ];
+            if (usage.method === 'set') {
+                argList.push({
+                    // Provide "value" argument.
+                    argumentCategory: 0 /* Simple */,
+                    typeResult: { type: (_b = usage.setType) !== null && _b !== void 0 ? _b : types_1.UnknownType.create() },
+                });
+            }
+            if ((0, types_1.isFunction)(accessMemberType) || (0, types_1.isOverloadedFunction)(accessMemberType)) {
+                const boundMethodType = bindFunctionToClassOrObject(classType, accessMemberType, classType, errorNode);
+                if (boundMethodType && ((0, types_1.isFunction)(boundMethodType) || (0, types_1.isOverloadedFunction)(boundMethodType))) {
+                    const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(boundMethodType));
+                    const callResult = validateCallArguments(errorNode, argList, { type: boundMethodType }, typeVarContext, 
+                    /* skipUnknownArgCheck */ true);
+                    return (_c = callResult.returnType) !== null && _c !== void 0 ? _c : types_1.UnknownType.create();
+                }
             }
         }
         return undefined;
@@ -4130,7 +4201,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         if ((0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
             const typeArgTypes = getTypeArgs(node, flags).map((t) => (0, typeUtils_1.convertToInstance)(t.type));
-            const type = types_1.TypeBase.cloneForTypeAlias(baseTypeResult.type, baseTypeResult.type.details.recursiveTypeAliasName, '', baseTypeResult.type.details.recursiveTypeAliasScopeId, undefined, typeArgTypes);
+            const type = types_1.TypeBase.cloneForTypeAlias(baseTypeResult.type, baseTypeResult.type.details.recursiveTypeAliasName, '', baseTypeResult.type.details.recursiveTypeAliasScopeId, baseTypeResult.type.details.recursiveTypeParameters, typeArgTypes);
             return { type, node };
         }
         let isIncomplete = false;
@@ -4369,9 +4440,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         const keywordArgs = node.items.filter((item) => item.argumentCategory === 0 /* Simple */ && !!item.name);
         const unpackedDictArgs = node.items.filter((item) => item.argumentCategory === 2 /* UnpackedDictionary */);
         let positionalIndexType;
+        let isPositionalIndexTypeIncomplete = false;
         if (positionalArgs.length === 1 && unpackedListArgs.length === 0 && !node.trailingComma) {
             // Handle the common case where there is a single positional argument.
-            positionalIndexType = getTypeOfExpression(positionalArgs[0].valueExpression).type;
+            const typeResult = getTypeOfExpression(positionalArgs[0].valueExpression);
+            positionalIndexType = typeResult.type;
+            if (typeResult.isIncomplete) {
+                isPositionalIndexTypeIncomplete = true;
+            }
         }
         else if (positionalArgs.length === 0 && unpackedListArgs.length === 0) {
             // Handle the case where there are no positionals provided but there are keywords.
@@ -4384,11 +4460,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // Package up all of the positionals into a tuple.
             const tupleEntries = [];
             positionalArgs.forEach((arg) => {
-                tupleEntries.push(getTypeOfExpression(arg.valueExpression).type);
+                const typeResult = getTypeOfExpression(arg.valueExpression);
+                tupleEntries.push(typeResult.type);
+                if (typeResult.isIncomplete) {
+                    isPositionalIndexTypeIncomplete = true;
+                }
             });
             unpackedListArgs.forEach((arg) => {
-                const exprType = getTypeOfExpression(arg.valueExpression).type;
-                const iterableType = getTypeOfIterator(exprType, /* isAsync */ false, arg) || types_1.UnknownType.create();
+                const typeResult = getTypeOfExpression(arg.valueExpression);
+                const exprType = typeResult.type;
+                if (typeResult.isIncomplete) {
+                    isPositionalIndexTypeIncomplete = true;
+                }
+                const iterableType = getTypeOfIterator(exprType, /* isAsync */ false, arg.valueExpression) || types_1.UnknownType.create();
                 tupleEntries.push(iterableType);
             });
             positionalIndexType = makeTupleObject(tupleEntries, unpackedListArgs.length > 0);
@@ -4396,7 +4480,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let argList = [
             {
                 argumentCategory: 0 /* Simple */,
-                type: positionalIndexType,
+                typeResult: { type: positionalIndexType, isIncomplete: isPositionalIndexTypeIncomplete },
             },
         ];
         if (usage.method === 'set') {
@@ -4408,7 +4492,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             argList.push({
                 argumentCategory: 0 /* Simple */,
-                type: setType,
+                typeResult: { type: setType, isIncomplete: isPositionalIndexTypeIncomplete },
             });
         }
         keywordArgs.forEach((arg) => {
@@ -4430,29 +4514,31 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Speculatively attempt the call. We may need to replace the index
         // type with 'int', and we don't want to emit errors before we know
         // which type to use.
-        useSpeculativeMode(node, () => {
-            callResult = validateCallArguments(node, argList, { type: itemMethodType });
-            if (callResult.argumentErrors) {
-                // If the object supports "__index__" magic method, convert
-                // the index it to an int and try again.
-                if ((0, types_1.isClassInstance)(positionalIndexType) && keywordArgs.length === 0 && unpackedDictArgs.length === 0) {
-                    const altArgList = [...argList];
-                    altArgList[0] = { ...altArgList[0] };
-                    const indexMethod = getTypeOfObjectMember(node, positionalIndexType, '__index__');
-                    if (indexMethod) {
-                        const intType = getBuiltInObject(node, 'int');
-                        if ((0, types_1.isClassInstance)(intType)) {
-                            altArgList[0].type = intType;
+        if (keywordArgs.length === 0 && unpackedDictArgs.length === 0 && positionalArgs.length === 1) {
+            useSpeculativeMode(node, () => {
+                callResult = validateCallArguments(node, argList, { type: itemMethodType });
+                if (callResult.argumentErrors) {
+                    // If the object supports "__index__" magic method, convert
+                    // the index to an int and try again.
+                    if ((0, types_1.isClassInstance)(positionalIndexType)) {
+                        const altArgList = [...argList];
+                        altArgList[0] = { ...altArgList[0] };
+                        const indexMethod = getTypeOfObjectMember(node, positionalIndexType, '__index__');
+                        if (indexMethod) {
+                            const intType = getBuiltInObject(node, 'int');
+                            if ((0, types_1.isClassInstance)(intType)) {
+                                altArgList[0].typeResult = { type: intType };
+                            }
+                        }
+                        callResult = validateCallArguments(node, altArgList, { type: itemMethodType });
+                        // We were successful, so replace the arg list.
+                        if (!callResult.argumentErrors) {
+                            argList = altArgList;
                         }
-                    }
-                    callResult = validateCallArguments(node, altArgList, { type: itemMethodType });
-                    // We were successful, so replace the arg list.
-                    if (!callResult.argumentErrors) {
-                        argList = altArgList;
                     }
                 }
-            }
-        });
+            });
+        }
         callResult = validateCallArguments(node, argList, { type: itemMethodType });
         return {
             node,
@@ -5028,7 +5114,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     bindToType: resultIsInstance && bindToType && (0, types_1.isInstantiableClass)(bindToType)
                         ? types_1.ClassType.cloneAsInstance(bindToType)
                         : bindToType,
-                    isSuperCall: true,
                 };
             }
         }
@@ -5040,7 +5125,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (targetClassType.details.mro.some((mroBase) => (0, types_1.isAnyOrUnknown)(mroBase))) {
                 return {
                     type: types_1.UnknownType.create(),
-                    isSuperCall: true,
                     node,
                 };
             }
@@ -5050,7 +5134,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if ((0, types_1.isInstantiableClass)(baseClassType)) {
                     return {
                         type: resultIsInstance ? types_1.ClassType.cloneAsInstance(baseClassType) : baseClassType,
-                        isSuperCall: true,
                         node,
                     };
                 }
@@ -5058,7 +5141,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return {
             type: types_1.UnknownType.create(),
-            isSuperCall: true,
             node,
         };
     }
@@ -5152,15 +5234,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let overloadIndex = 0;
         let matches = [];
         // Create a list of potential overload matches based on arguments.
-        type.overloads.forEach((overload) => {
+        types_1.OverloadedFunctionType.getOverloads(type).forEach((overload) => {
             useSpeculativeMode(errorNode, () => {
-                if (types_1.FunctionType.isOverloaded(overload)) {
-                    const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, overload, overloadIndex);
-                    if (!matchResults.argumentErrors) {
-                        matches.push(matchResults);
-                    }
-                    overloadIndex++;
+                const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, overload, overloadIndex);
+                if (!matchResults.argumentErrors) {
+                    matches.push(matchResults);
                 }
+                overloadIndex++;
             });
         });
         matches = sortOverloadsByBestMatch(matches);
@@ -5197,17 +5277,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // cache or record any diagnostics at this stage.
         useSpeculativeMode(errorNode, () => {
             let overloadIndex = 0;
-            type.overloads.forEach((overload) => {
+            types_1.OverloadedFunctionType.getOverloads(type).forEach((overload) => {
                 // Consider only the functions that have the @overload decorator,
                 // not the final function that omits the overload. This is the
                 // intended behavior according to PEP 484.
-                if (types_1.FunctionType.isOverloaded(overload)) {
-                    const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, overload, overloadIndex);
-                    if (!matchResults.argumentErrors) {
-                        filteredMatchResults.push(matchResults);
-                    }
-                    overloadIndex++;
+                const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, overload, overloadIndex);
+                if (!matchResults.argumentErrors) {
+                    filteredMatchResults.push(matchResults);
                 }
+                overloadIndex++;
             });
         });
         filteredMatchResults = sortOverloadsByBestMatch(filteredMatchResults);
@@ -5262,8 +5340,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // the expectedType. We'll use this to determine whether we need to do
                     // union expansion.
                     contextFreeArgTypes = argList.map((arg) => {
-                        if (arg.type) {
-                            return arg.type;
+                        if (arg.typeResult) {
+                            return arg.typeResult.type;
                         }
                         if (arg.valueExpression) {
                             const valueExpressionNode = arg.valueExpression;
@@ -5673,6 +5751,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         return (0, namedTuples_1.createNamedTupleType)(evaluatorInterface, errorNode, argList, 
                         /* includesTypes */ false);
                     }
+                    // Handle the NewType specially, replacing the normal return type.
+                    if (expandedSubtype.details.builtInName === 'NewType') {
+                        return createNewType(errorNode, argList);
+                    }
                     let effectiveTypeVarContext = typeVarContext;
                     if (!effectiveTypeVarContext) {
                         // If a typeVarContext wasn't provided by the caller, allocate one here.
@@ -5709,10 +5791,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             argumentErrors = true;
                         }
                     }
-                    // Handle the NewType specially, replacing the normal return type.
-                    if (!functionResult.argumentErrors && expandedSubtype.details.builtInName === 'NewType') {
-                        return createNewType(errorNode, argList);
-                    }
                     if (expandedSubtype.details.builtInName === '__import__') {
                         // For the special __import__ type, we'll override the return type to be "Any".
                         // This is required because we don't know what module was imported, and we don't
@@ -6165,7 +6243,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const funcArg = listElementType
                     ? {
                         argumentCategory: 0 /* Simple */,
-                        type: listElementType,
+                        typeResult: { type: listElementType, isIncomplete: argTypeResult.isIncomplete },
                     }
                     : undefined;
                 if (funcArg && argTypeResult.isIncomplete) {
@@ -6330,7 +6408,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                         requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                                         argument: {
                                             argumentCategory: 0 /* Simple */,
-                                            type: entry.valueType,
+                                            typeResult: { type: entry.valueType },
                                         },
                                         errorNode: argList[argIndex].valueExpression || errorNode,
                                         paramName: name,
@@ -6345,7 +6423,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                     requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                                     argument: {
                                         argumentCategory: 0 /* Simple */,
-                                        type: entry.valueType,
+                                        typeResult: { type: entry.valueType },
                                     },
                                     errorNode: argList[argIndex].valueExpression || errorNode,
                                     paramName: name,
@@ -6535,7 +6613,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             requiresTypeVarMatching: (0, typeUtils_1.requiresSpecialization)(paramType),
                             argument: {
                                 argumentCategory: 0 /* Simple */,
-                                type: unpackedDictionaryArgType,
+                                typeResult: { type: unpackedDictionaryArgType },
                             },
                             errorNode: (_b = (_a = argList.find((arg) => arg.argumentCategory === 2 /* UnpackedDictionary */)) === null || _a === void 0 ? void 0 : _a.valueExpression) !== null && _b !== void 0 ? _b : errorNode,
                             paramName: param.name,
@@ -6582,7 +6660,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                     requiresTypeVarMatching: true,
                                     argument: {
                                         argumentCategory: 0 /* Simple */,
-                                        type: defaultArgType,
+                                        typeResult: { type: defaultArgType },
                                     },
                                     errorNode: errorNode,
                                     paramName: param.name,
@@ -6636,7 +6714,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             paramCategory: 1 /* VarArgList */,
                             paramType,
                             requiresTypeVarMatching: true,
-                            argument: { argumentCategory: 0 /* Simple */, type: specializedTuple },
+                            argument: {
+                                argumentCategory: 0 /* Simple */,
+                                typeResult: { type: specializedTuple },
+                            },
                             errorNode,
                             paramName: paramDetails.params[paramDetails.argsIndex].param.name,
                             isParamNameSynthesized: paramDetails.params[paramDetails.argsIndex].param.isNameSynthesized,
@@ -6881,7 +6962,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // scope.
         let eliminateUnsolvedInUnions = true;
         let curNode = errorNode;
-        while (true) {
+        while (curNode) {
             const typeVarScopeNode = ParseTreeUtils.getTypeVarScopeNode(curNode);
             if (!typeVarScopeNode) {
                 break;
@@ -6890,7 +6971,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (typeVarContext.hasSolveForScope(typeVarScopeId)) {
                 eliminateUnsolvedInUnions = false;
             }
-            curNode = typeVarScopeNode;
+            curNode = typeVarScopeNode.parent;
         }
         // If the function is returning a callable, don't eliminate unsolved
         // type vars within a union. There are legit uses for unsolved type vars
@@ -7138,7 +7219,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (argParam.argType) {
                 argType = argParam.argType;
             }
-            else if (argParam.expectingType && !argParam.argument.type && argParam.argument.valueExpression) {
+            else if (argParam.expectingType && !argParam.argument.typeResult && argParam.argument.valueExpression) {
                 const argTypeResult = getTypeOfExpression(argParam.argument.valueExpression, 8 /* EvaluateStringLiteralAsType */ |
                     32 /* ParamSpecDisallowed */ |
                     128 /* TypeVarTupleDisallowed */);
@@ -7317,7 +7398,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return { isCompatible, argType, isTypeIncomplete, condition };
     }
     function createTypeVarType(errorNode, argList) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         let typeVarName = '';
         let firstConstraintArg;
         if (argList.length === 0) {
@@ -7346,7 +7427,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         addError(localize_1.Localizer.Diagnostic.typeVarBoundAndConstrained(), argList[i].valueExpression || errorNode);
                     }
                     else {
-                        const argType = (_a = argList[i].type) !== null && _a !== void 0 ? _a : getTypeOfExpressionExpectingType(argList[i].valueExpression, 
+                        const argType = (_b = (_a = argList[i].typeResult) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : getTypeOfExpressionExpectingType(argList[i].valueExpression, 
                         /* allowFinal */ undefined, 
                         /* allowRequired */ undefined).type;
                         if ((0, typeUtils_1.requiresSpecialization)(argType, /* ignorePseudoGeneric */ true)) {
@@ -7357,26 +7438,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 else if (paramName === 'covariant') {
                     if (argList[i].valueExpression && getBooleanValue(argList[i].valueExpression)) {
-                        if (typeVar.details.variance === 2 /* Contravariant */) {
+                        if (typeVar.details.declaredVariance === 4 /* Contravariant */) {
                             addError(localize_1.Localizer.Diagnostic.typeVarVariance(), argList[i].valueExpression);
                         }
                         else {
-                            typeVar.details.variance = 1 /* Covariant */;
+                            typeVar.details.declaredVariance = 3 /* Covariant */;
                         }
                     }
                 }
                 else if (paramName === 'contravariant') {
                     if (argList[i].valueExpression && getBooleanValue(argList[i].valueExpression)) {
-                        if (typeVar.details.variance === 1 /* Covariant */) {
+                        if (typeVar.details.declaredVariance === 3 /* Covariant */) {
                             addError(localize_1.Localizer.Diagnostic.typeVarVariance(), argList[i].valueExpression);
                         }
                         else {
-                            typeVar.details.variance = 2 /* Contravariant */;
+                            typeVar.details.declaredVariance = 4 /* Contravariant */;
                         }
                     }
                 }
                 else {
-                    addError(localize_1.Localizer.Diagnostic.typeVarUnknownParam().format({ name: paramName }), ((_b = argList[i].node) === null || _b === void 0 ? void 0 : _b.name) || argList[i].valueExpression || errorNode);
+                    addError(localize_1.Localizer.Diagnostic.typeVarUnknownParam().format({ name: paramName }), ((_c = argList[i].node) === null || _c === void 0 ? void 0 : _c.name) || argList[i].valueExpression || errorNode);
                 }
                 paramNameMap.set(paramName, paramName);
             }
@@ -7385,7 +7466,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     addError(localize_1.Localizer.Diagnostic.typeVarBoundAndConstrained(), argList[i].valueExpression || errorNode);
                 }
                 else {
-                    const argType = (_c = argList[i].type) !== null && _c !== void 0 ? _c : getTypeOfExpressionExpectingType(argList[i].valueExpression, 
+                    const argType = (_e = (_d = argList[i].typeResult) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : getTypeOfExpressionExpectingType(argList[i].valueExpression, 
                     /* allowFinal */ undefined, 
                     /* allowRequired */ undefined).type;
                     if ((0, typeUtils_1.requiresSpecialization)(argType, /* ignorePseudoGeneric */ true)) {
@@ -7880,7 +7961,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // incomplete because we may be evaluating types within a loop,
         // so the literal values may change each time.
         const isLiteralMathAllowed = !ParseTreeUtils.isWithinLoop(node);
-        let type = validateBinaryOperation(node.operator, leftType, rightType, node, expectedType, diag, isLiteralMathAllowed);
+        let type = validateBinaryOperation(node.operator, { type: leftType, isIncomplete: leftTypeResult.isIncomplete }, { type: rightType, isIncomplete: rightTypeResult.isIncomplete }, node, expectedType, diag, isLiteralMathAllowed);
         if (!diag.isEmpty() || !type) {
             if (!isIncomplete) {
                 const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
@@ -7966,14 +8047,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         return (0, typeUtils_1.preserveUnknown)(leftSubtypeUnexpanded, rightSubtypeUnexpanded);
                     }
                     const magicMethodName = operatorMap[node.operator][0];
-                    let returnType = getTypeOfMagicMethodReturn(leftSubtypeUnexpanded, [rightSubtypeUnexpanded], magicMethodName, node, expectedType);
+                    let returnType = getTypeOfMagicMethodReturn(leftSubtypeUnexpanded, [{ type: rightSubtypeUnexpanded, isIncomplete: rightTypeResult.isIncomplete }], magicMethodName, node, expectedType);
                     if (!returnType && leftSubtypeUnexpanded !== leftSubtypeExpanded) {
                         // Try with the expanded left type.
-                        returnType = getTypeOfMagicMethodReturn(leftSubtypeExpanded, [rightSubtypeUnexpanded], magicMethodName, node, expectedType);
+                        returnType = getTypeOfMagicMethodReturn(leftSubtypeExpanded, [{ type: rightSubtypeUnexpanded, isIncomplete: rightTypeResult.isIncomplete }], magicMethodName, node, expectedType);
                     }
                     if (!returnType && rightSubtypeUnexpanded !== rightSubtypeExpanded) {
                         // Try with the expanded left and right type.
-                        returnType = getTypeOfMagicMethodReturn(leftSubtypeExpanded, [rightSubtypeExpanded], magicMethodName, node, expectedType);
+                        returnType = getTypeOfMagicMethodReturn(leftSubtypeExpanded, [{ type: rightSubtypeExpanded, isIncomplete: rightTypeResult.isIncomplete }], magicMethodName, node, expectedType);
                     }
                     if (!returnType) {
                         // If the LHS class didn't support the magic method for augmented
@@ -7986,7 +8067,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             !rightTypeResult.isIncomplete &&
                             (0, typeUtils_1.getUnionSubtypeCount)(leftType) * (0, typeUtils_1.getUnionSubtypeCount)(rightType) <
                                 maxLiteralMathSubtypeCount;
-                        returnType = validateBinaryOperation(binaryOperator, leftSubtypeUnexpanded, rightSubtypeUnexpanded, node, expectedType, diag, isLiteralMathAllowed);
+                        returnType = validateBinaryOperation(binaryOperator, { type: leftSubtypeUnexpanded, isIncomplete: leftTypeResult.isIncomplete }, { type: rightSubtypeUnexpanded, isIncomplete: rightTypeResult.isIncomplete }, node, expectedType, diag, isLiteralMathAllowed);
                     }
                     return returnType;
                 });
@@ -8009,7 +8090,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         assignTypeToExpression(node.destExpression, typeResult.type, !!typeResult.isIncomplete, node.rightExpression);
         return typeResult;
     }
-    function validateBinaryOperation(operator, leftType, rightType, errorNode, expectedType, diag, isLiteralMathAllowed) {
+    function validateBinaryOperation(operator, leftTypeResult, rightTypeResult, errorNode, expectedType, diag, isLiteralMathAllowed) {
+        const leftType = leftTypeResult.type;
+        const rightType = rightTypeResult.type;
         let type;
         let concreteLeftType = makeTopLevelTypeVarsConcrete(leftType);
         if (booleanOperatorMap[operator] !== undefined) {
@@ -8059,7 +8142,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         if ((0, types_1.isAnyOrUnknown)(leftSubtype) || (0, types_1.isAnyOrUnknown)(rightSubtypeUnexpanded)) {
                             return (0, typeUtils_1.preserveUnknown)(leftSubtype, rightSubtypeExpanded);
                         }
-                        let returnType = getTypeOfMagicMethodReturn(rightSubtypeExpanded, [leftSubtype], '__contains__', errorNode, 
+                        let returnType = getTypeOfMagicMethodReturn(rightSubtypeExpanded, [{ type: leftSubtype, isIncomplete: leftTypeResult.isIncomplete }], '__contains__', errorNode, 
                         /* expectedType */ undefined);
                         if (!returnType) {
                             // If __contains__ was not supported, fall back
@@ -8216,26 +8299,31 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             ]));
                         }
                         const magicMethodName = binaryOperatorMap[operator][0];
-                        let resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(leftSubtypeUnexpanded), [rightSubtypeUnexpanded], magicMethodName, errorNode, expectedType);
+                        let resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(leftSubtypeUnexpanded), [{ type: rightSubtypeUnexpanded, isIncomplete: rightTypeResult.isIncomplete }], magicMethodName, errorNode, expectedType);
                         if (!resultType && leftSubtypeUnexpanded !== leftSubtypeExpanded) {
                             // Try the expanded left type.
-                            resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(leftSubtypeExpanded), [rightSubtypeUnexpanded], magicMethodName, errorNode, expectedType);
+                            resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(leftSubtypeExpanded), [{ type: rightSubtypeUnexpanded, isIncomplete: rightTypeResult.isIncomplete }], magicMethodName, errorNode, expectedType);
                         }
                         if (!resultType && rightSubtypeUnexpanded !== rightSubtypeExpanded) {
                             // Try the expanded left and right type.
-                            resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(leftSubtypeExpanded), [rightSubtypeExpanded], magicMethodName, errorNode, expectedType);
+                            resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(leftSubtypeExpanded), [{ type: rightSubtypeExpanded, isIncomplete: rightTypeResult.isIncomplete }], magicMethodName, errorNode, expectedType);
                         }
                         if (!resultType) {
                             // Try the alternate form (swapping right and left).
                             const altMagicMethodName = binaryOperatorMap[operator][1];
-                            resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(rightSubtypeUnexpanded), [leftSubtypeUnexpanded], altMagicMethodName, errorNode, expectedType);
+                            resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(rightSubtypeUnexpanded), [{ type: leftSubtypeUnexpanded, isIncomplete: leftTypeResult.isIncomplete }], altMagicMethodName, errorNode, expectedType);
                             if (!resultType && rightSubtypeUnexpanded !== rightSubtypeExpanded) {
                                 // Try the expanded right type.
-                                resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(rightSubtypeExpanded), [leftSubtypeUnexpanded], altMagicMethodName, errorNode, expectedType);
+                                resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(rightSubtypeExpanded), [
+                                    {
+                                        type: leftSubtypeUnexpanded,
+                                        isIncomplete: leftTypeResult.isIncomplete,
+                                    },
+                                ], altMagicMethodName, errorNode, expectedType);
                             }
                             if (!resultType && leftSubtypeUnexpanded !== leftSubtypeExpanded) {
                                 // Try the expanded right and left type.
-                                resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(rightSubtypeExpanded), [leftSubtypeExpanded], altMagicMethodName, errorNode, expectedType);
+                                resultType = getTypeOfMagicMethodReturn(convertFunctionToObject(rightSubtypeExpanded), [{ type: leftSubtypeExpanded, isIncomplete: leftTypeResult.isIncomplete }], altMagicMethodName, errorNode, expectedType);
                             }
                         }
                         if (!resultType) {
@@ -8283,7 +8371,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const functionArgs = args.map((arg) => {
                     return {
                         argumentCategory: 0 /* Simple */,
-                        type: arg,
+                        typeResult: arg,
                     };
                 });
                 let callResult;
@@ -9079,15 +9167,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return { type, node, isIncomplete };
     }
     function getTypeOfSlice(node) {
-        // Evaluate the expressions to report errors and record symbol references.
-        if (node.startValue) {
-            getTypeOfExpression(node.startValue);
-        }
-        if (node.endValue) {
-            getTypeOfExpression(node.endValue);
-        }
-        if (node.stepValue) {
-            getTypeOfExpression(node.stepValue);
+        // Evaluate the expressions to report errors and record symbol
+        // references. We can skip this if we're executing speculatively.
+        if (!speculativeTypeTracker.isSpeculative(node)) {
+            if (node.startValue) {
+                getTypeOfExpression(node.startValue);
+            }
+            if (node.endValue) {
+                getTypeOfExpression(node.endValue);
+            }
+            if (node.stepValue) {
+                getTypeOfExpression(node.stepValue);
+            }
         }
         return { type: getBuiltInObject(node, 'slice'), node };
     }
@@ -9832,7 +9923,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return undefined;
     }
-    function transformTypeForTypeAlias(type, name, errorNode) {
+    function transformTypeForTypeAlias(type, name, errorNode, typeParameters) {
         if (!types_1.TypeBase.isInstantiable(type)) {
             return type;
         }
@@ -9841,17 +9932,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, typeUtils_1.isTypeAliasPlaceholder)(type)) {
             return type;
         }
-        // Determine if there are any generic type parameters associated
-        // with this type alias.
-        let typeParameters = [];
-        // Skip this for a simple TypeVar (one that's not part of a union).
-        if (!(0, types_1.isTypeVar)(type) || types_1.TypeBase.isAnnotated(type)) {
-            (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
-                (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(subtype));
-            });
+        if (!typeParameters) {
+            // Determine if there are any generic type parameters associated
+            // with this type alias.
+            typeParameters = [];
+            // Skip this for a simple TypeVar (one that's not part of a union).
+            if (!(0, types_1.isTypeVar)(type) || types_1.TypeBase.isAnnotated(type)) {
+                (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
+                    (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(subtype));
+                });
+            }
+            // Don't include any synthesized type variables.
+            typeParameters = typeParameters.filter((typeVar) => !typeVar.details.isSynthesized);
         }
-        // Don't include any synthesized type variables.
-        typeParameters = typeParameters.filter((typeVar) => !typeVar.details.isSynthesized);
         // Convert all type variables to instances.
         typeParameters = typeParameters.map((typeVar) => {
             if (types_1.TypeBase.isInstance(typeVar)) {
@@ -10052,7 +10145,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             if (!rightHandType) {
                 // Determine whether there is a declared type.
-                const declaredType = getDeclaredTypeForExpression(node.leftExpression, { method: 'set' });
+                const declaredType = getDeclaredTypeForExpression(node.leftExpression, {
+                    method: 'set',
+                });
                 let typeAliasNameNode;
                 let isSpeculativeTypeAlias = false;
                 if (isDeclaredTypeAlias(node.leftExpression)) {
@@ -10158,6 +10253,62 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         /* allowAssignmentToFinalVar */ true, expectedTypeDiagAddendum);
         writeTypeCache(node, rightHandType, 0 /* None */, isIncomplete);
     }
+    // Evaluates the type of a type alias (i.e. "type") statement. This code
+    // path does not handle traditional type aliases, which are treated as
+    // variables since they use normal variable assignment syntax.
+    function getTypeOfTypeAlias(node) {
+        const cachedType = readTypeCache(node.name, 0 /* None */);
+        if (cachedType) {
+            return cachedType;
+        }
+        // Synthesize a type variable that represents the type alias while we're
+        // evaluating it. This allows us to handle recursive definitions.
+        const typeAliasTypeVar = types_1.TypeVarType.createInstantiable(`__type_alias_${node.name.value}`);
+        typeAliasTypeVar.details.isSynthesized = true;
+        typeAliasTypeVar.details.recursiveTypeAliasName = node.name.value;
+        const scopeId = getScopeIdForNode(node.name);
+        typeAliasTypeVar.details.recursiveTypeAliasScopeId = scopeId;
+        typeAliasTypeVar.scopeId = scopeId;
+        // Write the type to the type cache. It will be replaced below.
+        writeTypeCache(node.name, typeAliasTypeVar, /* flags */ undefined, /* isIncomplete */ false);
+        // Set a partial type to handle recursive (self-referential) type aliases.
+        const scope = ScopeUtils.getScopeForNode(node);
+        const typeAliasSymbol = scope === null || scope === void 0 ? void 0 : scope.lookUpSymbolRecursive(node.name.value);
+        const typeAliasDecl = AnalyzerNodeInfo.getDeclaration(node);
+        if (typeAliasDecl && typeAliasSymbol) {
+            setSymbolResolutionPartialType(typeAliasSymbol.symbol, typeAliasDecl, typeAliasTypeVar);
+        }
+        let typeParameters = [];
+        if (node.typeParameters) {
+            typeParameters = evaluateTypeParameterList(node.typeParameters);
+            typeAliasTypeVar.details.recursiveTypeParameters = typeParameters;
+        }
+        const aliasTypeResult = getTypeOfExpressionExpectingType(node.expression);
+        let isIncomplete = false;
+        let aliasType = aliasTypeResult.type;
+        if (aliasTypeResult.isIncomplete) {
+            isIncomplete = true;
+        }
+        // Clear the temporary type we wrote above.
+        deleteTypeCacheEntry(node.name);
+        aliasType = transformTypeForTypeAlias(aliasType, node.name, node.expression, typeParameters);
+        if ((0, typeUtils_1.isTypeAliasRecursive)(typeAliasTypeVar, aliasType)) {
+            addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasIsRecursiveDirect().format({
+                name: node.name.value,
+            }), node.expression);
+            aliasType = types_1.UnknownType.create();
+        }
+        // Set the resulting type to the boundType of the original type alias
+        // to support recursive type aliases.
+        typeAliasTypeVar.details.boundType = aliasType;
+        if (typeAliasTypeVar.details.illegalRecursionDetected) {
+            addDiagnostic(AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeAliasIsRecursiveIndirect().format({
+                name: node.name.value,
+            }), node.name);
+        }
+        writeTypeCache(node.name, aliasType, 0 /* None */, isIncomplete);
+        return aliasType;
+    }
     function evaluateTypesForAugmentedAssignment(node) {
         if (readTypeCache(node, 0 /* None */)) {
             return;
@@ -10223,7 +10374,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         writeTypeCache(node.name, classType, /* flags */ undefined, /* isIncomplete */ false);
         // Keep a list of unique type parameters that are used in the
         // base class arguments.
-        const typeParameters = [];
+        let typeParameters = [];
+        if (node.typeParameters) {
+            typeParameters = evaluateTypeParameterList(node.typeParameters).map((t) => types_1.TypeVarType.cloneAsInstance(t));
+        }
         // If the class derives from "Generic" directly, it will provide
         // all of the type parameters in the specified order.
         let genericTypeParameters;
@@ -10344,12 +10498,18 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 (0, typeUtils_1.addTypeVarsToListIfUnique)(typeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
                 if ((0, types_1.isInstantiableClass)(argType)) {
                     if (types_1.ClassType.isBuiltIn(argType, 'Generic')) {
-                        if (!genericTypeParameters) {
-                            if (protocolTypeParameters) {
-                                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateGenericAndProtocolBase(), arg.valueExpression);
+                        // 'Generic' is implicitly added if type parameter syntax is used.
+                        if (node.typeParameters) {
+                            addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.genericBaseClassNotAllowed(), arg.valueExpression);
+                        }
+                        else {
+                            if (!genericTypeParameters) {
+                                if (protocolTypeParameters) {
+                                    addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.duplicateGenericAndProtocolBase(), arg.valueExpression);
+                                }
+                                genericTypeParameters = [];
+                                (0, typeUtils_1.addTypeVarsToListIfUnique)(genericTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
                             }
-                            genericTypeParameters = [];
-                            (0, typeUtils_1.addTypeVarsToListIfUnique)(genericTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
                         }
                     }
                     else if (types_1.ClassType.isBuiltIn(argType, 'Protocol') &&
@@ -10361,6 +10521,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             }
                             protocolTypeParameters = [];
                             (0, typeUtils_1.addTypeVarsToListIfUnique)(protocolTypeParameters, (0, typeUtils_1.getTypeVarArgumentsRecursive)(argType));
+                            if (node.typeParameters && protocolTypeParameters.length > 0) {
+                                addDiagnostic(fileInfo.diagnosticRuleSet.reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.protocolBaseClassWithTypeArgs(), arg.valueExpression);
+                                protocolTypeParameters = [];
+                            }
                         }
                     }
                 }
@@ -10423,10 +10587,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // If genericTypeParameters or protocolTypeParameters are provided,
         // make sure that typeParameters is a proper subset.
         genericTypeParameters = genericTypeParameters !== null && genericTypeParameters !== void 0 ? genericTypeParameters : protocolTypeParameters;
-        if (genericTypeParameters) {
+        if (genericTypeParameters && !node.typeParameters) {
             verifyGenericTypeParameters(node.name, typeParameters, genericTypeParameters);
         }
-        classType.details.typeParameters = genericTypeParameters || typeParameters;
+        classType.details.typeParameters = genericTypeParameters !== null && genericTypeParameters !== void 0 ? genericTypeParameters : typeParameters;
+        // Determine if one or more type parameters is autovariance.
+        if (classType.details.typeParameters.some((param) => param.details.declaredVariance === 0 /* Auto */ && param.computedVariance === undefined)) {
+            classType.details.requiresVarianceInference = true;
+        }
         // Make sure there's at most one variadic type parameter.
         const variadics = classType.details.typeParameters.filter((param) => (0, types_1.isVariadicTypeVar)(param));
         if (variadics.length > 1) {
@@ -10456,7 +10624,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const initMethod = classType.details.fields.get('__init__');
             if (initMethod) {
                 const initDecls = initMethod.getTypedDeclarations();
-                if (initDecls.length === 1 && initDecls[0].type === 3 /* Function */) {
+                if (initDecls.length === 1 && initDecls[0].type === 5 /* Function */) {
                     const initDeclNode = initDecls[0].node;
                     const initParams = initDeclNode.parameters;
                     if (initParams.length > 1 &&
@@ -10506,6 +10674,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         const effectiveMetaclass = computeEffectiveMetaclass(classType, node.name);
+        // Clear the "partially constructed" flag.
+        classType.details.flags &= ~131072 /* PartiallyEvaluated */;
         // Now determine the decorated type of the class.
         let decoratedType = classType;
         let foundUnknown = false;
@@ -10542,8 +10712,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             (0, dataClasses_1.applyDataClassDefaultBehaviors)(classType, dataClassBehaviors);
             (0, dataClasses_1.applyDataClassClassBehaviorOverrides)(evaluatorInterface, classType, initSubclassArgs);
         }
-        // Clear the "partially constructed" flag.
-        classType.details.flags &= ~131072 /* PartiallyEvaluated */;
         // Run any class hooks that depend on this class.
         runClassTypeHooks(classType);
         // Synthesize TypedDict methods.
@@ -10619,6 +10787,87 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         return { classType, decoratedType };
     }
+    function inferTypeParameterVarianceForClass(classType) {
+        if (!classType.details.requiresVarianceInference) {
+            return;
+        }
+        if (!objectType || !(0, types_1.isClassInstance)(objectType)) {
+            return;
+        }
+        // Presumptively mark the variance inference as complete. This
+        // prevents potential recursion.
+        classType.details.requiresVarianceInference = false;
+        // Presumptively mark the computed variance to "in progress". We'll
+        // replace this below once the variance has been inferred.
+        classType.details.typeParameters.forEach((param) => {
+            if (param.details.declaredVariance === 0 /* Auto */) {
+                param.computedVariance = 1 /* Unknown */;
+            }
+        });
+        // Replace all of the type parameters with invariant TypeVars.
+        const updatedTypeParams = classType.details.typeParameters.map((typeParam) => types_1.TypeVarType.cloneAsInvariant(typeParam));
+        const updatedClassType = types_1.ClassType.cloneWithNewTypeParameters(classType, updatedTypeParams);
+        const dummyTypeObject = types_1.ClassType.createInstantiable('__varianceDummy', '', '', '', 0, 0, undefined, undefined);
+        updatedTypeParams.forEach((param, paramIndex) => {
+            // Skip variadics and ParamSpecs.
+            if (param.details.isVariadic || param.details.isParamSpec) {
+                return;
+            }
+            // Skip type variables without auto-variance.
+            if (param.details.declaredVariance !== 0 /* Auto */) {
+                return;
+            }
+            // Replace all type arguments with a dummy type except for the
+            // TypeVar of interest, which is replaced with an object instance.
+            const srcTypeArgs = updatedTypeParams.map((p, i) => {
+                if (p.details.isVariadic) {
+                    return p;
+                }
+                return i === paramIndex ? objectType : dummyTypeObject;
+            });
+            // Replace all type arguments with a dummy type except for the
+            // TypeVar of interest, which is replaced with itself.
+            const destTypeArgs = updatedTypeParams.map((p, i) => {
+                return i === paramIndex || p.details.isVariadic ? p : dummyTypeObject;
+            });
+            const srcType = types_1.ClassType.cloneForSpecialization(updatedClassType, srcTypeArgs, 
+            /* isTypeArgumentExplicit */ true);
+            const destType = types_1.ClassType.cloneForSpecialization(updatedClassType, destTypeArgs, 
+            /* isTypeArgumentExplicit */ true);
+            const isDestSubtypeOfSrc = assignClassToSelf(srcType, destType);
+            let inferredVariance;
+            if (isDestSubtypeOfSrc) {
+                inferredVariance = 3 /* Covariant */;
+            }
+            else {
+                const isSrcSubtypeOfDest = assignClassToSelf(destType, srcType);
+                if (isSrcSubtypeOfDest) {
+                    inferredVariance = 4 /* Contravariant */;
+                }
+                else {
+                    inferredVariance = 2 /* Invariant */;
+                }
+            }
+            // We assume here that we don't need to clone the type var object
+            // because it was already cloned when it was associated with this
+            // class scope.
+            classType.details.typeParameters[paramIndex].computedVariance = inferredVariance;
+        });
+    }
+    function evaluateTypeParameterList(node) {
+        const paramTypes = [];
+        node.parameters.forEach((param) => {
+            const paramSymbol = AnalyzerNodeInfo.getTypeParameterSymbol(param.name);
+            (0, debug_1.assert)(paramSymbol);
+            const typeOfParam = getDeclaredTypeOfSymbol(paramSymbol, param.name);
+            if (!typeOfParam || !(0, types_1.isTypeVar)(typeOfParam)) {
+                return;
+            }
+            writeTypeCache(param.name, typeOfParam, 0 /* None */, /* isIncomplete */ false);
+            paramTypes.push(typeOfParam);
+        });
+        return paramTypes;
+    }
     function computeEffectiveMetaclass(classType, errorNode) {
         let effectiveMetaclass = classType.details.declaredMetaclass;
         let reportedMetaclassConflict = false;
@@ -10944,6 +11193,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }), node.functionAnnotationComment);
             }
         }
+        if (node.typeParameters) {
+            evaluateTypeParameterList(node.typeParameters);
+        }
         const markParamAccessed = (param) => {
             if (param.name) {
                 const symbolWithScope = lookUpSymbolRecursive(param.name, param.name.value, /* honorCodeFlow */ false);
@@ -11252,7 +11504,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const baseClassMemberInfo = (0, typeUtils_1.lookUpClassMember)(containingClassType, methodName, 1 /* SkipOriginalClass */);
             if (baseClassMemberInfo) {
                 const memberDecls = baseClassMemberInfo.symbol.getDeclarations();
-                if (memberDecls.length === 1 && memberDecls[0].type === 3 /* Function */) {
+                if (memberDecls.length === 1 && memberDecls[0].type === 5 /* Function */) {
                     const baseClassMethodNode = memberDecls[0].node;
                     // Does the signature match exactly with the exception of annotations?
                     if (baseClassMethodNode.parameters.length === functionNode.parameters.length &&
@@ -11529,14 +11781,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // to recursion if there is a large number (1000's) of overloads.
                 for (let i = 0; i < declIndex; i++) {
                     const decl = decls[i];
-                    if (decl.type === 3 /* Function */) {
+                    if (decl.type === 5 /* Function */) {
                         getTypeOfFunction(decl.node);
                     }
                 }
                 const overloadedTypes = [];
                 // Look at the previous declaration's type.
                 const prevDecl = decls[declIndex - 1];
-                if (prevDecl.type === 3 /* Function */) {
+                if (prevDecl.type === 5 /* Function */) {
                     const prevDeclDeclTypeInfo = getTypeOfFunction(prevDecl.node);
                     if (prevDeclDeclTypeInfo) {
                         if ((0, types_1.isFunction)(prevDeclDeclTypeInfo.decoratedType)) {
@@ -11878,7 +12130,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     // For "async while", an implicit "await" is performed.
                     if (isAsync) {
-                        memberReturnType = getTypeOfAwaitable(memberReturnType, node);
+                        memberReturnType = getTypeOfAwaitable(memberReturnType, node.expression);
                     }
                     return memberReturnType;
                 }
@@ -12086,19 +12338,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // case, we want to choose the last declaration.
         const filteredDecls = symbolWithScope.symbol
             .getDeclarations()
-            .filter((decl) => ParseTreeUtils.isNodeContainedWithin(node, decl.node) && decl.type === 6 /* Alias */);
+            .filter((decl) => ParseTreeUtils.isNodeContainedWithin(node, decl.node) && decl.type === 8 /* Alias */);
         let aliasDecl = filteredDecls.length > 0 ? filteredDecls[filteredDecls.length - 1] : undefined;
         // If we didn't find an exact match, look for any alias associated with
         // this symbol. In cases where we have multiple ImportAs nodes that share
         // the same first-part name (e.g. "import asyncio" and "import asyncio.tasks"),
         // we may not find the declaration associated with this node.
         if (!aliasDecl) {
-            aliasDecl = symbolWithScope.symbol.getDeclarations().find((decl) => decl.type === 6 /* Alias */);
+            aliasDecl = symbolWithScope.symbol.getDeclarations().find((decl) => decl.type === 8 /* Alias */);
         }
         if (!aliasDecl) {
             return undefined;
         }
-        (0, debug_1.assert)(aliasDecl.type === 6 /* Alias */);
+        (0, debug_1.assert)(aliasDecl.type === 8 /* Alias */);
         const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
         // Try to resolve the alias while honoring external visibility.
         const resolvedAliasInfo = resolveAliasDeclarationWithInfo(aliasDecl, 
@@ -12135,7 +12387,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // expression or statement that contains it. This contextual evaluation
     // allows for bidirectional type evaluation.
     function evaluateTypesForExpressionInContext(node) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         let lastContextualExpression = node;
         let curNode = node;
         function isContextual(node) {
@@ -12204,6 +12456,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 getTypeOfClass(node.parent);
                 return;
             }
+            else if (node.parent.nodeType === 77 /* TypeAlias */ && node.parent.name === node) {
+                getTypeOfTypeAlias(node.parent);
+                return;
+            }
             else if (node.parent.nodeType === 29 /* Global */ ||
                 node.parent.nodeType === 39 /* Nonlocal */) {
                 // For global and nonlocal statements, allow forward references so
@@ -12242,15 +12498,32 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             verifyDeleteExpression(lastContextualExpression);
             return;
         }
+        // If this is the name node within a type parameter list, see if it's a type alias
+        // definition. If so, we need to evaluate the type alias contextually.
+        if (parent.nodeType === 75 /* TypeParameter */ && lastContextualExpression === parent.name) {
+            if (((_a = parent.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 76 /* TypeParameterList */ &&
+                ((_b = parent.parent.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 77 /* TypeAlias */) {
+                getTypeOfTypeAlias(parent.parent.parent);
+                return;
+            }
+        }
+        if (parent.nodeType === 75 /* TypeParameter */) {
+            getTypeOfExpression(parent.name);
+            return;
+        }
+        if (parent.nodeType === 77 /* TypeAlias */) {
+            getTypeOfTypeAlias(parent);
+            return;
+        }
         if (parent.nodeType === 5 /* AugmentedAssignment */) {
             evaluateTypesForAugmentedAssignment(parent);
             return;
         }
         if (parent.nodeType === 13 /* Decorator */) {
-            if (((_a = parent.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 10 /* Class */) {
+            if (((_c = parent.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 10 /* Class */) {
                 getTypeOfClass(parent.parent);
             }
-            else if (((_b = parent.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 28 /* Function */) {
+            else if (((_d = parent.parent) === null || _d === void 0 ? void 0 : _d.nodeType) === 28 /* Function */) {
                 getTypeOfFunction(parent.parent);
             }
             return;
@@ -12301,7 +12574,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             return;
         }
         // A class argument must be evaluated in the context of the class declaration.
-        if (parent.nodeType === 1 /* Argument */ && ((_c = parent.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 10 /* Class */) {
+        if (parent.nodeType === 1 /* Argument */ && ((_e = parent.parent) === null || _e === void 0 ? void 0 : _e.nodeType) === 10 /* Class */) {
             getTypeOfClass(parent.parent);
             return;
         }
@@ -12397,6 +12670,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     break;
                 }
+                case 77 /* TypeAlias */: {
+                    getTypeOfTypeAlias(curNode);
+                    return;
+                }
                 case 4 /* AssignmentExpression */: {
                     getTypeOfExpression(curNode);
                     return;
@@ -12844,8 +13121,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return specializedClass;
     }
     function getTypeOfArgument(arg) {
-        if (arg.type) {
-            return { type: arg.type };
+        if (arg.typeResult) {
+            return { type: arg.typeResult.type, isIncomplete: arg.typeResult.isIncomplete };
         }
         if (!arg.valueExpression) {
             // We shouldn't ever get here, but just in case.
@@ -12860,8 +13137,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // and therefore follows the normal rules of types (e.g. they
     // can be forward-declared in stubs, etc.).
     function getTypeOfArgumentExpectingType(arg) {
-        if (arg.type) {
-            return { type: arg.type };
+        if (arg.typeResult) {
+            return { type: arg.typeResult.type, isIncomplete: arg.typeResult.isIncomplete };
         }
         // If there was no defined type provided, there should always
         // be a value expression from which we can retrieve the type.
@@ -12923,10 +13200,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (symbolWithScope && honorCodeFlow && scopeTypeHonorsCodeFlow) {
             // Filter the declarations based on flow reachability.
             const reachableDecls = symbolWithScope.symbol.getDeclarations().filter((decl) => {
-                if (decl.type !== 6 /* Alias */ && decl.type !== 0 /* Intrinsic */) {
+                if (decl.type !== 8 /* Alias */ && decl.type !== 0 /* Intrinsic */) {
                     // Is the declaration in the same execution scope as the "usageNode" node?
                     const usageScope = ParseTreeUtils.getExecutionScopeNode(node);
-                    const declNode = decl.type === 4 /* Class */ || decl.type === 3 /* Function */
+                    const declNode = decl.type === 6 /* Class */ ||
+                        decl.type === 5 /* Function */ ||
+                        decl.type === 4 /* TypeAlias */
                         ? decl.node.name
                         : decl.node;
                     const declScope = ParseTreeUtils.getExecutionScopeNode(declNode);
@@ -13044,7 +13323,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, types_1.isFunction)(type)) {
             if (type.details.declaration) {
                 const functionDecl = type.details.declaration;
-                if (functionDecl.type === 3 /* Function */) {
+                if (functionDecl.type === 5 /* Function */) {
                     const functionNode = functionDecl.node;
                     const functionScope = AnalyzerNodeInfo.getScope(functionNode);
                     if (functionScope) {
@@ -13108,7 +13387,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     // The alias could have more decls that don't refer to this import. Filter
                     // out the one(s) that specifically associated with this import statement.
                     const declsForThisImport = symbolInScope.symbol.getDeclarations().filter((decl) => {
-                        return decl.type === 6 /* Alias */ && decl.node === node.parent;
+                        return decl.type === 8 /* Alias */ && decl.node === node.parent;
                     });
                     (0, collectionUtils_1.appendArray)(declarations, (0, declarationUtils_1.getDeclarationsWithUsesLocalNameRemoved)(declsForThisImport));
                 }
@@ -13117,7 +13396,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         else if (node.parent &&
             node.parent.nodeType === 35 /* MemberAccess */ &&
             node === node.parent.memberName) {
-            let baseType = getTypeOfExpression(node.parent.leftExpression, 2 /* DoNotSpecialize */).type;
+            let baseType = getType(node.parent.leftExpression);
             if (baseType) {
                 baseType = makeTopLevelTypeVarsConcrete(baseType);
                 const memberName = node.parent.memberName.value;
@@ -13192,7 +13471,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             const argNode = node.parent;
             const paramName = node.value;
             if (argNode.parent && argNode.parent.nodeType === 9 /* Call */) {
-                const baseType = getTypeOfExpression(argNode.parent.leftExpression, 2 /* DoNotSpecialize */).type;
+                const baseType = getType(argNode.parent.leftExpression);
                 if (baseType) {
                     if ((0, types_1.isFunction)(baseType) && baseType.details.declaration) {
                         const paramDecl = getDeclarationFromFunctionNamedParameter(baseType, paramName);
@@ -13232,9 +13511,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             // Determine if this node is within a quoted type annotation.
             const isWithinTypeAnnotation = ParseTreeUtils.isWithinTypeAnnotation(node, !(0, analyzerFileInfo_1.isAnnotationEvaluationPostponed)(AnalyzerNodeInfo.getFileInfo(node)));
             const allowForwardReferences = isWithinTypeAnnotation || fileInfo.isStubFile;
-            const symbolWithScope = lookUpSymbolRecursive(node, node.value, !allowForwardReferences, isWithinTypeAnnotation);
-            if (symbolWithScope) {
-                (0, collectionUtils_1.appendArray)(declarations, symbolWithScope.symbol.getDeclarations());
+            let symbol;
+            const typeParamSymbol = AnalyzerNodeInfo.getTypeParameterSymbol(node);
+            if (typeParamSymbol) {
+                symbol = typeParamSymbol;
+            }
+            else {
+                const symbolWithScope = lookUpSymbolRecursive(node, node.value, !allowForwardReferences, isWithinTypeAnnotation);
+                symbol = symbolWithScope === null || symbolWithScope === void 0 ? void 0 : symbolWithScope.symbol;
+            }
+            if (symbol) {
+                (0, collectionUtils_1.appendArray)(declarations, symbol.getDeclarations());
             }
         }
         return declarations;
@@ -13280,17 +13567,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 return types_1.UnknownType.create();
             }
-            case 4 /* Class */: {
+            case 6 /* Class */: {
                 const classTypeInfo = getTypeOfClass(declaration.node);
                 return classTypeInfo === null || classTypeInfo === void 0 ? void 0 : classTypeInfo.decoratedType;
             }
-            case 5 /* SpecialBuiltInClass */: {
+            case 7 /* SpecialBuiltInClass */: {
                 return getTypeOfAnnotation(declaration.node.typeAnnotation);
             }
-            case 3 /* Function */: {
+            case 5 /* Function */: {
                 const functionTypeInfo = getTypeOfFunction(declaration.node);
                 return functionTypeInfo === null || functionTypeInfo === void 0 ? void 0 : functionTypeInfo.decoratedType;
             }
+            case 4 /* TypeAlias */: {
+                return getTypeOfTypeAlias(declaration.node);
+            }
             case 2 /* Parameter */: {
                 let typeAnnotationNode = declaration.node.typeAnnotation || declaration.node.typeAnnotationComment;
                 // If there wasn't an annotation, see if the parent function
@@ -13312,6 +13602,62 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 return undefined;
             }
+            case 3 /* TypeParameter */: {
+                let typeVar = types_1.TypeVarType.createInstantiable(declaration.node.name.value);
+                if (declaration.node.typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVarTuple) {
+                    typeVar.details.isVariadic = true;
+                }
+                else if (declaration.node.typeParamCategory === parseNodes_1.TypeParameterCategory.ParamSpec) {
+                    typeVar.details.isParamSpec = true;
+                }
+                if (declaration.node.boundExpression) {
+                    if (declaration.node.boundExpression.nodeType === 52 /* Tuple */) {
+                        const constraints = declaration.node.boundExpression.expressions.map((constraint) => {
+                            const constraintType = getTypeOfExpressionExpectingType(constraint).type;
+                            if ((0, typeUtils_1.requiresSpecialization)(constraintType, /* ignorePseudoGeneric */ true)) {
+                                addError(localize_1.Localizer.Diagnostic.typeVarGeneric(), constraint);
+                            }
+                            return (0, typeUtils_1.convertToInstance)(constraintType);
+                        });
+                        if (constraints.length < 2) {
+                            addDiagnostic(AnalyzerNodeInfo.getFileInfo(declaration.node.boundExpression).diagnosticRuleSet
+                                .reportGeneralTypeIssues, diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.Localizer.Diagnostic.typeVarSingleConstraint(), declaration.node.boundExpression);
+                        }
+                        else if (declaration.node.typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVar) {
+                            typeVar.details.constraints = constraints;
+                        }
+                    }
+                    else {
+                        const boundType = getTypeOfExpressionExpectingType(declaration.node.boundExpression).type;
+                        if ((0, typeUtils_1.requiresSpecialization)(boundType, /* ignorePseudoGeneric */ true)) {
+                            addError(localize_1.Localizer.Diagnostic.typeVarGeneric(), declaration.node.boundExpression);
+                        }
+                        if (declaration.node.typeParamCategory === parseNodes_1.TypeParameterCategory.TypeVar) {
+                            typeVar.details.boundType = (0, typeUtils_1.convertToInstance)(boundType);
+                        }
+                    }
+                }
+                typeVar.details.isTypeParamSyntax = true;
+                // Associate the type variable with the owning scope.
+                const scopeNode = ParseTreeUtils.getTypeVarScopeNode(declaration.node);
+                if (scopeNode) {
+                    let scopeType;
+                    if (scopeNode.nodeType === 10 /* Class */) {
+                        scopeType = 0 /* Class */;
+                        // Set the variance to "auto" for class-scoped TypeVars.
+                        typeVar.details.declaredVariance = 0 /* Auto */;
+                    }
+                    else if (scopeNode.nodeType === 28 /* Function */) {
+                        scopeType = 1 /* Function */;
+                    }
+                    else {
+                        (0, debug_1.assert)(scopeNode.nodeType === 77 /* TypeAlias */);
+                        scopeType = 2 /* TypeAlias */;
+                    }
+                    typeVar = types_1.TypeVarType.cloneForScopeId(typeVar, getScopeIdForNode(scopeNode.nodeType === 77 /* TypeAlias */ ? scopeNode.name : scopeNode), scopeNode.name.value, scopeType);
+                }
+                return typeVar;
+            }
             case 1 /* Variable */: {
                 const typeAnnotationNode = declaration.typeAnnotationNode;
                 if (typeAnnotationNode) {
@@ -13349,7 +13695,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 return undefined;
             }
-            case 6 /* Alias */: {
+            case 8 /* Alias */: {
                 return undefined;
             }
         }
@@ -13396,11 +13742,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // If the resolved declaration is still an alias, the alias
         // is pointing at a module, and we need to synthesize a
         // module type.
-        if (resolvedDecl.type === 6 /* Alias */) {
+        if (resolvedDecl.type === 8 /* Alias */) {
             // Build a module type that corresponds to the declaration and
             // its associated loader actions.
             let moduleName = resolvedDecl.moduleName;
-            if (decl.type === 6 /* Alias */) {
+            if (decl.type === 8 /* Alias */) {
                 if (decl.symbolName) {
                     moduleName += '.' + decl.symbolName;
                 }
@@ -13651,7 +13997,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 considerDecl = false;
             }
             if (usageNode !== undefined) {
-                if (decl.type !== 6 /* Alias */) {
+                if (decl.type !== 8 /* Alias */) {
                     // Is the declaration in the same execution scope as the "usageNode" node?
                     const usageScope = ParseTreeUtils.getExecutionScopeNode(usageNode);
                     const declScope = ParseTreeUtils.getExecutionScopeNode(decl.node);
@@ -13764,9 +14110,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // reachable from the usage node (if specified). This can happen in
         // cases where a property symbol is redefined to add a setter, deleter,
         // etc.
-        if (typedDecls.length > 1 && usageNode) {
+        if (usageNode && typedDecls.length > 1) {
             const filteredTypedDecls = typedDecls.filter((decl) => {
-                if (decl.type !== 6 /* Alias */) {
+                if (decl.type !== 8 /* Alias */) {
                     // Is the declaration in the same execution scope as the "usageNode" node?
                     const usageScope = ParseTreeUtils.getExecutionScopeNode(usageNode);
                     const declScope = ParseTreeUtils.getExecutionScopeNode(decl.node);
@@ -13778,9 +14124,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 return true;
             });
-            if (filteredTypedDecls.length > 0) {
-                typedDecls = filteredTypedDecls;
+            if (filteredTypedDecls.length === 0) {
+                return types_1.UnboundType.create();
             }
+            typedDecls = filteredTypedDecls;
         }
         // Start with the last decl. If that's already being resolved,
         // use the next-to-last decl, etc. This can happen when resolving
@@ -13806,7 +14153,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         // in the type cache. This exception is required to handle the
                         // circular dependency between the "type" and "object" classes in
                         // builtins.pyi (since "object" is a "type" and "type" is an "object").
-                        if (popSymbolResolution(symbol) || decl.type === 4 /* Class */) {
+                        if (popSymbolResolution(symbol) || decl.type === 6 /* Class */) {
                             return type;
                         }
                     }
@@ -13965,9 +14312,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if (returnTypeInferenceContextStack.length >= maxReturnTypeInferenceStackSize) {
             return undefined;
         }
+        const paramTypes = [];
+        let isResultFromCache = false;
         // Suppress diagnostics because we don't want to generate errors.
         suppressDiagnostics(functionNode, () => {
-            var _a;
+            var _a, _b;
             // Allocate a new temporary type cache for the context of just
             // this function so we can analyze it separately without polluting
             // the main type cache.
@@ -14010,13 +14359,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         if (!paramType) {
                             paramType = types_1.UnknownType.create();
                         }
+                        paramTypes.push(paramType);
                         writeTypeCache(param.name, paramType, 0 /* None */, /* isIncomplete */ false);
                     }
                 });
                 // Don't bother trying to determine the contextual return
                 // type if none of the argument types are known.
                 if (!allArgTypesAreUnknown) {
-                    contextualReturnType = (_a = inferFunctionReturnType(functionNode, types_1.FunctionType.isAbstractMethod(type))) === null || _a === void 0 ? void 0 : _a.type;
+                    // See if the return type is already cached. If so, skip the
+                    // inference step, which is potentially very expensive.
+                    const cacheEntry = (_a = functionType.functionType.callSiteReturnTypeCache) === null || _a === void 0 ? void 0 : _a.find((entry) => {
+                        return (entry.paramTypes.length === paramTypes.length &&
+                            entry.paramTypes.every((t, i) => (0, types_1.isTypeSame)(t, paramTypes[i])));
+                    });
+                    if (cacheEntry) {
+                        contextualReturnType = cacheEntry.returnType;
+                        isResultFromCache = true;
+                    }
+                    else {
+                        contextualReturnType = (_b = inferFunctionReturnType(functionNode, types_1.FunctionType.isAbstractMethod(type))) === null || _b === void 0 ? void 0 : _b.type;
+                    }
                 }
             }
             finally {
@@ -14030,6 +14392,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (types_1.FunctionType.isWrapReturnTypeInAwait(type) && !(0, types_1.isNever)(contextualReturnType)) {
                 contextualReturnType = createAwaitableReturnType(functionNode, contextualReturnType, !!((_a = type.details.declaration) === null || _a === void 0 ? void 0 : _a.isGenerator));
             }
+            if (!isResultFromCache) {
+                // Cache the resulting type.
+                if (!functionType.functionType.callSiteReturnTypeCache) {
+                    functionType.functionType.callSiteReturnTypeCache = [];
+                }
+                if (functionType.functionType.callSiteReturnTypeCache.length >= maxCallSiteReturnTypeCacheSize) {
+                    functionType.functionType.callSiteReturnTypeCache =
+                        functionType.functionType.callSiteReturnTypeCache.slice(1);
+                }
+                functionType.functionType.callSiteReturnTypeCache.push({
+                    paramTypes,
+                    returnType: contextualReturnType,
+                });
+            }
             return contextualReturnType;
         }
         return undefined;
@@ -14157,6 +14533,63 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }));
         return false;
     }
+    // This function is used to validate or infer the variance of type
+    // parameters within a class.
+    function assignClassToSelf(destType, srcType, recursionCount = 0) {
+        (0, debug_1.assert)(types_1.ClassType.isSameGenericClass(destType, srcType));
+        (0, debug_1.assert)(destType.details.typeParameters.length > 0);
+        const diag = new diagnostic_1.DiagnosticAddendum();
+        const typeVarContext = new typeVarContext_1.TypeVarContext();
+        let isAssignable = true;
+        destType.details.fields.forEach((symbol, name) => {
+            if (isAssignable && symbol.isClassMember() && !symbol.isIgnoredForProtocolMatch()) {
+                const memberInfo = (0, typeUtils_1.lookUpClassMember)(srcType, name);
+                (0, debug_1.assert)(memberInfo !== undefined);
+                let destMemberType = getDeclaredTypeOfSymbol(symbol);
+                if (destMemberType) {
+                    const srcMemberType = getTypeOfMember(memberInfo);
+                    destMemberType = (0, typeUtils_1.partiallySpecializeType)(destMemberType, destType);
+                    // Properties require special processing.
+                    if ((0, types_1.isClassInstance)(destMemberType) &&
+                        types_1.ClassType.isPropertyClass(destMemberType) &&
+                        (0, types_1.isClassInstance)(srcMemberType) &&
+                        types_1.ClassType.isPropertyClass(srcMemberType)) {
+                        if (!(0, properties_1.assignProperty)(evaluatorInterface, types_1.ClassType.cloneAsInstantiable(destMemberType), types_1.ClassType.cloneAsInstantiable(srcMemberType), destType, srcType, diag, typeVarContext, 
+                        /* selfTypeVarContext */ undefined, recursionCount)) {
+                            isAssignable = false;
+                        }
+                    }
+                    else {
+                        const primaryDecl = symbol.getDeclarations()[0];
+                        // Class and instance variables that are mutable need to
+                        // enforce invariance.
+                        const flags = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.type) === 1 /* Variable */ && !primaryDecl.isFinal
+                            ? 1 /* EnforceInvariance */
+                            : 0 /* Default */;
+                        if (!assignType(destMemberType, srcMemberType, diag, typeVarContext, 
+                        /* srcTypeVarContext */ undefined, flags, recursionCount)) {
+                            isAssignable = false;
+                        }
+                    }
+                }
+            }
+        });
+        // Now handle generic base classes.
+        destType.details.baseClasses.forEach((baseClass) => {
+            if ((0, types_1.isInstantiableClass)(baseClass) &&
+                !types_1.ClassType.isBuiltIn(baseClass, 'object') &&
+                !types_1.ClassType.isBuiltIn(baseClass, 'Protocol') &&
+                !types_1.ClassType.isBuiltIn(baseClass, 'Generic') &&
+                baseClass.details.typeParameters.length > 0) {
+                const specializedDestBaseClass = (0, typeUtils_1.specializeForBaseClass)(destType, baseClass);
+                const specializedSrcBaseClass = (0, typeUtils_1.specializeForBaseClass)(srcType, baseClass);
+                if (!assignClassToSelf(specializedDestBaseClass, specializedSrcBaseClass, recursionCount)) {
+                    isAssignable = false;
+                }
+            }
+        });
+        return isAssignable;
+    }
     function assignTupleTypeArgs(destType, srcType, diag, typeVarContext, flags, recursionCount) {
         var _a, _b;
         const destTypeArgs = [...((_a = destType.tupleTypeArguments) !== null && _a !== void 0 ? _a : [])];
@@ -14250,6 +14683,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         let curSrcType = srcType;
         let curTypeVarContext = destTypeVarContext !== null && destTypeVarContext !== void 0 ? destTypeVarContext : new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(destType));
         let effectiveFlags = flags;
+        inferTypeParameterVarianceForClass(destType);
         // If we're using a private typeVarContext, don't skip solving type vars.
         if (!destTypeVarContext) {
             effectiveFlags &= ~8 /* SkipSolveTypeVars */;
@@ -14330,6 +14764,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     function verifyTypeArgumentsAssignable(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
         var _a, _b, _c;
         (0, debug_1.assert)(types_1.ClassType.isSameGenericClass(destType, srcType));
+        inferTypeParameterVarianceForClass(destType);
         const destTypeParams = types_1.ClassType.getTypeParameters(destType);
         let destTypeArgs;
         let srcTypeArgs;
@@ -14356,7 +14791,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const destTypeArg = destArgIndex >= 0 ? destTypeArgs[destArgIndex] : types_1.UnknownType.create();
                 const destTypeParam = destArgIndex < destTypeParams.length ? destTypeParams[destArgIndex] : undefined;
                 const assignmentDiag = new diagnostic_1.DiagnosticAddendum();
-                if (!destTypeParam || destTypeParam.details.variance === 1 /* Covariant */) {
+                if (!destTypeParam || types_1.TypeVarType.getVariance(destTypeParam) === 3 /* Covariant */) {
                     if (!assignType(destTypeArg, srcTypeArg, assignmentDiag, destTypeVarContext, srcTypeVarContext, flags | 128 /* RetainLiteralsForTypeVar */, recursionCount)) {
                         if (diag) {
                             if (destTypeParam) {
@@ -14373,7 +14808,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                         return false;
                     }
                 }
-                else if (destTypeParam.details.variance === 2 /* Contravariant */) {
+                else if (types_1.TypeVarType.getVariance(destTypeParam) === 4 /* Contravariant */) {
                     if (!assignType(srcTypeArg, destTypeArg, assignmentDiag, srcTypeVarContext, destTypeVarContext, (flags ^ 2 /* ReverseTypeVarMatching */) | 128 /* RetainLiteralsForTypeVar */, recursionCount)) {
                         if (diag) {
                             const childDiag = diag.createAddendum();
@@ -14854,11 +15289,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 // Find first overloaded function that matches the parameters.
                 // We don't want to pollute the current typeVarContext, so we'll
                 // make a copy of the existing one if it's specified.
-                const overloads = concreteSrcType.overloads;
+                const overloads = types_1.OverloadedFunctionType.getOverloads(concreteSrcType);
                 const overloadIndex = overloads.findIndex((overload) => {
-                    if (!types_1.FunctionType.isOverloaded(overload)) {
-                        return false;
-                    }
                     return assignType(destType, overload, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext === null || destTypeVarContext === void 0 ? void 0 : destTypeVarContext.clone(), srcTypeVarContext === null || srcTypeVarContext === void 0 ? void 0 : srcTypeVarContext.clone(), flags, recursionCount);
                 });
                 if (overloadIndex < 0) {
@@ -14882,10 +15314,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         if ((0, types_1.isOverloadedFunction)(destType)) {
             const overloadDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
             // All overloads in the dest must be assignable.
-            const isAssignable = destType.overloads.every((destOverload) => {
-                if (!types_1.FunctionType.isOverloaded(destOverload)) {
-                    return true;
-                }
+            const isAssignable = types_1.OverloadedFunctionType.getOverloads(destType).every((destOverload) => {
                 if (destTypeVarContext) {
                     destTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(destOverload));
                 }
@@ -15017,6 +15446,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         // For union sources, all of the types need to be assignable to the dest.
         let isIncompatible = false;
+        // Sort the subtypes so we have a deterministic order for unions.
         (0, typeUtils_1.doForEachSubtype)(srcType, (subtype, subtypeIndex) => {
             if (isIncompatible) {
                 return;
@@ -15041,7 +15471,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     isIncompatible = true;
                 }
             }
-        });
+        }, 
+        /* sortSubtypes */ true);
         if (isIncompatible) {
             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.typeAssignmentMismatch().format({
                 sourceType: printType(srcType),
@@ -15056,6 +15487,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // matches for types like `tuple[Any]` and `tuple[int]` from being considered
     // proper subtypes of each other.
     function isProperSubtype(destType, srcType, recursionCount) {
+        // Shortcut the check if either type is Any or Unknown.
+        if ((0, types_1.isAnyOrUnknown)(destType) || (0, types_1.isAnyOrUnknown)(srcType)) {
+            return true;
+        }
+        // Shortcut the check if either type is a class whose hierarchy contains an unknown type.
+        if ((0, types_1.isClass)(destType) && destType.details.mro.some((mro) => (0, types_1.isAnyOrUnknown)(mro))) {
+            return true;
+        }
+        if ((0, types_1.isClass)(srcType) && srcType.details.mro.some((mro) => (0, types_1.isAnyOrUnknown)(mro))) {
+            return true;
+        }
         return (assignType(destType, srcType, 
         /* diag */ undefined, 
         /* destTypeVarContext */ undefined, 
@@ -16005,22 +16447,41 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         return narrowedType;
     }
     function validateOverrideMethod(baseMethod, overrideMethod, diag, enforceParamNames = true) {
-        var _a, _b;
-        // If we're overriding an overloaded method, uses the implementation.
-        if ((0, types_1.isOverloadedFunction)(baseMethod)) {
-            const implementation = baseMethod.overloads.find((overload) => !types_1.FunctionType.isOverloaded(overload));
-            // If the overloaded method doesn't have an implementation, skip the check.
-            if (!implementation) {
-                return true;
-            }
-            baseMethod = implementation;
-        }
         // If we're overriding a non-method with a method, report it as an error.
         // This occurs when a non-property overrides a property.
-        if (!(0, types_1.isFunction)(baseMethod)) {
+        if (!(0, types_1.isFunction)(baseMethod) && !(0, types_1.isOverloadedFunction)(baseMethod)) {
             diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideType().format({ type: printType(baseMethod) }));
             return false;
         }
+        if ((0, types_1.isFunction)(baseMethod)) {
+            // Handle the easy case - a simple function overriding another simple function.
+            if ((0, types_1.isFunction)(overrideMethod)) {
+                return validateOverrideMethodInternal(baseMethod, overrideMethod, diag, enforceParamNames);
+            }
+            // For an overload overriding a base method, at least one overload
+            // must be compatible with the base method.
+            if (types_1.OverloadedFunctionType.getOverloads(overrideMethod).some((overrideOverload) => {
+                return validateOverrideMethodInternal(baseMethod, overrideOverload, 
+                /* diag */ undefined, enforceParamNames);
+            })) {
+                return true;
+            }
+            // Or the implementation must be compatible.
+            const overrideImplementation = types_1.OverloadedFunctionType.getImplementation(overrideMethod);
+            if (overrideImplementation) {
+                if (validateOverrideMethodInternal(baseMethod, overrideImplementation, 
+                /* diag */ undefined, enforceParamNames)) {
+                    return true;
+                }
+            }
+            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNoOverloadMatches());
+            return false;
+        }
+        // TODO - need to implement the case where the base method is overloaded
+        return true;
+    }
+    function validateOverrideMethodInternal(baseMethod, overrideMethod, diag, enforceParamNames) {
+        var _a, _b;
         const baseParamDetails = (0, typeUtils_1.getParameterListDetails)(baseMethod);
         const overrideParamDetails = (0, typeUtils_1.getParameterListDetails)(overrideMethod);
         let canOverride = true;
@@ -16028,19 +16489,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // an incompatible type.
         if (types_1.FunctionType.isStaticMethod(baseMethod)) {
             if (!types_1.FunctionType.isStaticMethod(overrideMethod)) {
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotStaticMethod());
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotStaticMethod());
                 canOverride = false;
             }
         }
         else if (types_1.FunctionType.isClassMethod(baseMethod)) {
             if (!types_1.FunctionType.isClassMethod(overrideMethod)) {
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotClassMethod());
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotClassMethod());
                 canOverride = false;
             }
         }
         if (types_1.FunctionType.isInstanceMethod(baseMethod)) {
             if (!types_1.FunctionType.isInstanceMethod(overrideMethod)) {
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotInstanceMethod());
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideNotInstanceMethod());
                 canOverride = false;
             }
         }
@@ -16065,7 +16526,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
         }
         if (foundParamCountMismatch) {
-            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overridePositionalParamCount().format({
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overridePositionalParamCount().format({
                 baseCount: baseParamDetails.params.length,
                 overrideCount: overrideParamDetails.params.length,
             }));
@@ -16092,13 +16553,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (overrideParam.category === 0 /* Simple */) {
                     if (enforceParamNames) {
                         if (overrideParamDetails.params[i].source === typeUtils_1.ParameterSource.PositionOnly) {
-                            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNamePositionOnly().format({
+                            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNamePositionOnly().format({
                                 index: i + 1,
                                 baseName: baseParam.name || '*',
                             }));
                         }
                         else {
-                            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamName().format({
+                            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamName().format({
                                 index: i + 1,
                                 baseName: baseParam.name || '*',
                                 overrideName: overrideParam.name || '*',
@@ -16110,7 +16571,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             }
             else if (i < overrideParamDetails.positionOnlyParamCount &&
                 i >= baseParamDetails.positionOnlyParamCount) {
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNamePositionOnly().format({
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNamePositionOnly().format({
                     index: i + 1,
                     baseName: baseParam.name || '*',
                 }));
@@ -16123,8 +16584,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 const overrideIsSynthesizedTypeVar = (0, types_1.isTypeVar)(overrideParamType) && overrideParamType.details.isSynthesized;
                 if (!baseIsSynthesizedTypeVar && !overrideIsSynthesizedTypeVar) {
                     if (baseParam.category !== overrideParam.category ||
-                        !assignType(overrideParamType, baseParamType, diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), 8 /* SkipSolveTypeVars */)) {
-                        diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamType().format({
+                        !assignType(overrideParamType, baseParamType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), 8 /* SkipSolveTypeVars */)) {
+                        diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamType().format({
                             index: i + 1,
                             baseType: printType(baseParamType),
                             overrideType: printType(overrideParamType),
@@ -16133,7 +16594,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                 }
                 if (baseParamDetails.params[i].param.hasDefault && !overrideParamDetails.params[i].param.hasDefault) {
-                    diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNoDefault().format({
+                    diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNoDefault().format({
                         index: i + 1,
                     }));
                     canOverride = false;
@@ -16143,7 +16604,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Check for a *args match.
         if (baseParamDetails.argsIndex !== undefined) {
             if (overrideParamDetails.argsIndex === undefined) {
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameMissing().format({
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameMissing().format({
                     name: (_a = baseParamDetails.params[baseParamDetails.argsIndex].param.name) !== null && _a !== void 0 ? _a : '?',
                 }));
                 canOverride = false;
@@ -16151,9 +16612,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             else {
                 const overrideParamType = overrideParamDetails.params[overrideParamDetails.argsIndex].type;
                 const baseParamType = baseParamDetails.params[baseParamDetails.argsIndex].type;
-                if (!assignType(overrideParamType, baseParamType, diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), 
+                if (!assignType(overrideParamType, baseParamType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), 
                 /* srcTypeVarContext */ undefined, 8 /* SkipSolveTypeVars */)) {
-                    diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordType().format({
+                    diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordType().format({
                         name: (_b = overrideParamDetails.params[overrideParamDetails.argsIndex].param.name) !== null && _b !== void 0 ? _b : '?',
                         baseType: printType(baseParamType),
                         overrideType: printType(overrideParamType),
@@ -16171,7 +16632,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             var _a, _b, _c;
             const overrideParamInfo = overrideWkOnlyParams.find((pi) => paramInfo.param.name === pi.param.name);
             if (!overrideParamInfo && overrideParamDetails.kwargsIndex === undefined) {
-                diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameMissing().format({
+                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameMissing().format({
                     name: (_a = paramInfo.param.name) !== null && _a !== void 0 ? _a : '?',
                 }));
                 canOverride = false;
@@ -16181,9 +16642,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 if (!targetParamType) {
                     targetParamType = overrideParamDetails.params[overrideParamDetails.kwargsIndex].type;
                 }
-                if (!assignType(targetParamType, paramInfo.type, diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), 
+                if (!assignType(targetParamType, paramInfo.type, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(overrideMethod)), 
                 /* srcTypeVarContext */ undefined, 8 /* SkipSolveTypeVars */)) {
-                    diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordType().format({
+                    diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordType().format({
                         name: (_b = paramInfo.param.name) !== null && _b !== void 0 ? _b : '?',
                         baseType: printType(paramInfo.type),
                         overrideType: printType(targetParamType),
@@ -16192,7 +16653,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                 }
                 if (overrideParamInfo) {
                     if (paramInfo.param.hasDefault && !overrideParamInfo.param.hasDefault) {
-                        diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordNoDefault().format({
+                        diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamKeywordNoDefault().format({
                             name: (_c = overrideParamInfo.param.name) !== null && _c !== void 0 ? _c : '?',
                         }));
                         canOverride = false;
@@ -16208,7 +16669,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
             if (!baseParamInfo) {
                 if (baseParamDetails.kwargsIndex === undefined) {
                     if (!paramInfo.param.hasDefault) {
-                        diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameExtra().format({
+                        diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideParamNameExtra().format({
                             name: (_a = paramInfo.param.name) !== null && _a !== void 0 ? _a : '?',
                         }));
                         canOverride = false;
@@ -16219,9 +16680,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         // Now check the return type.
         const baseReturnType = getFunctionEffectiveReturnType(baseMethod);
         const overrideReturnType = getFunctionEffectiveReturnType(overrideMethod);
-        if (!assignType(baseReturnType, overrideReturnType, diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), 
+        if (!assignType(baseReturnType, overrideReturnType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(baseMethod)), 
         /* srcTypeVarContext */ undefined, 8 /* SkipSolveTypeVars */)) {
-            diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideReturnType().format({
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.Localizer.DiagnosticAddendum.overrideReturnType().format({
                 baseType: printType(baseReturnType),
                 overrideType: printType(overrideReturnType),
             }));
@@ -16347,7 +16808,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if (symbol.isClassMember() || symbol.isNamedTupleMemberMember()) {
                         let isAbstract;
                         const decl = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(symbol);
-                        if (decl && decl.type === 3 /* Function */) {
+                        if (decl && decl.type === 5 /* Function */) {
                             const functionFlags = getFunctionFlagsFromDecorators(decl.node, true);
                             isAbstract = !!(functionFlags & 8 /* AbstractMethod */);
                         }
@@ -16623,6 +17084,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         assignType,
         validateOverrideMethod,
         assignTypeToExpression,
+        assignClassToSelf,
         getTypedDictClassType,
         getTupleClassType,
         getObjectType,
@@ -16630,10 +17092,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         getTypingType,
         verifyTypeArgumentsAssignable,
         inferReturnTypeIfNecessary,
+        inferTypeParameterVarianceForClass,
         addError,
         addWarning,
         addInformation,
         addUnusedCode,
+        addUnreachableCode,
         addDeprecated,
         addDiagnostic,
         addDiagnosticForTextRange,