@zzzen/pyright-internal 1.2.0-dev.20240519 → 1.2.0-dev.20240602

package/dist/analyzer/typeEvaluator.js

@@ -183,27 +183,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     let expectedTypeCache = new Map();
     let deferredClassCompletions = [];
     let cancellationToken;
-    let isBasicTypesInitialized = false;
-    let noneClassType;
-    let noneType;
-    let objectType;
-    let typeClassType;
-    let unionClassType;
-    let awaitableProtocolType;
-    let functionObj;
-    let tupleClassType;
-    let boolClassType;
-    let intClassType;
-    let strClassType;
-    let dictClassType;
-    let typedDictClassType;
-    let typedDictPrivateClassType;
-    let supportsKeysAndGetItemProtocolType;
-    let mappingType;
     let printExpressionSpaceCount = 0;
     let incompleteGenerationCount = 0;
     const returnTypeInferenceContextStack = [];
     let returnTypeInferenceTypeCache;
+    let isPrefetchedTypesInitialized = false;
+    // Various types prefetched from stdlib stubs
+    let noneTypeClass;
+    let objectClass;
+    let typeClass;
+    let unionTypeClass;
+    let awaitableClass;
+    let functionClass;
+    let tupleClass;
+    let boolClass;
+    let intClass;
+    let strClass;
+    let dictClass;
+    let typedDictPrivateClass;
+    let supportsKeysAndGetItemClass;
+    let mappingClass;
     function runWithCancellationToken(token, callback) {
         try {
             cancellationToken = token;
@@ -383,7 +382,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // type of surrounding statements to be evaluated.
     function getType(node) {
         var _a, _b;
-        initializedBasicTypes(node);
+        initializePrefetchedTypes(node);
         let type = (_a = evaluateTypeForSubnode(node, () => {
             evaluateTypesForExpressionInContext(node);
         })) === null || _a === void 0 ? void 0 : _a.type;
@@ -456,50 +455,42 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return undefined;
     }
-    function initializedBasicTypes(node) {
+    function initializePrefetchedTypes(node) {
         var _a;
-        if (!isBasicTypesInitialized) {
+        if (!isPrefetchedTypesInitialized) {
             // Some of these types have cyclical dependencies on each other,
             // so don't re-enter this block once we start executing it.
-            isBasicTypesInitialized = true;
-            objectType = getBuiltInObject(node, 'object');
-            typeClassType = getBuiltInType(node, 'type');
-            functionObj = getBuiltInObject(node, 'function');
-            unionClassType = getTypesType(node, 'UnionType');
-            if (unionClassType && (0, types_1.isClass)(unionClassType)) {
-                unionClassType.details.flags |= -2147483648 /* ClassTypeFlags.SpecialFormClass */;
+            isPrefetchedTypesInitialized = true;
+            objectClass = getBuiltInType(node, 'object');
+            typeClass = getBuiltInType(node, 'type');
+            functionClass = getBuiltInType(node, 'function');
+            unionTypeClass = getTypesType(node, 'UnionType');
+            if (unionTypeClass && (0, types_1.isClass)(unionTypeClass)) {
+                unionTypeClass.details.flags |= -2147483648 /* ClassTypeFlags.SpecialFormClass */;
             }
             // Initialize and cache "Collection" to break a cyclical dependency
             // that occurs when resolving tuple below.
             getTypingType(node, 'Collection');
-            noneClassType = (_a = getTypeshedType(node, 'NoneType')) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
-            noneType = (0, types_1.isInstantiableClass)(noneClassType)
-                ? types_1.ClassType.cloneAsInstance(noneClassType)
-                : types_1.UnknownType.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');
-            typedDictPrivateClassType = getTypingType(node, '_TypedDict');
-            awaitableProtocolType = getTypingType(node, 'Awaitable');
-            mappingType = getTypingType(node, 'Mapping');
-            supportsKeysAndGetItemProtocolType = getTypeshedType(node, 'SupportsKeysAndGetItem');
-            if (!supportsKeysAndGetItemProtocolType) {
+            noneTypeClass = (_a = getTypeshedType(node, 'NoneType')) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+            tupleClass = getBuiltInType(node, 'tuple');
+            boolClass = getBuiltInType(node, 'bool');
+            intClass = getBuiltInType(node, 'int');
+            strClass = getBuiltInType(node, 'str');
+            dictClass = getBuiltInType(node, 'dict');
+            typedDictPrivateClass = getTypingType(node, '_TypedDict');
+            awaitableClass = getTypingType(node, 'Awaitable');
+            mappingClass = getTypingType(node, 'Mapping');
+            supportsKeysAndGetItemClass = getTypeshedType(node, 'SupportsKeysAndGetItem');
+            if (!supportsKeysAndGetItemClass) {
                 // Fall back on 'Mapping' if 'SupportsKeysAndGetItem' is not available.
-                supportsKeysAndGetItemProtocolType = mappingType;
+                supportsKeysAndGetItemClass = mappingClass;
             }
             // Wire up the `Any` class to the special-form version of our internal AnyType.
-            const objectClass = getBuiltInType(node, 'object');
-            if (objectClass &&
-                (0, types_1.isInstantiableClass)(objectClass) &&
-                typeClassType &&
-                (0, types_1.isInstantiableClass)(typeClassType)) {
+            if (objectClass && (0, types_1.isInstantiableClass)(objectClass) && typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
                 const anyClass = types_1.ClassType.createInstantiable('Any', 'typing.Any', 'typing', uri_1.Uri.empty(), 1 /* ClassTypeFlags.BuiltInClass */ | -2147483648 /* ClassTypeFlags.SpecialFormClass */, 
                 /* typeSourceId */ -1, 
                 /* declaredMetaclass */ undefined, 
-                /* effectiveMetaclass */ typeClassType);
+                /* effectiveMetaclass */ typeClass);
                 anyClass.details.baseClasses.push(objectClass);
                 (0, typeUtils_1.computeMroLinearization)(anyClass);
                 const anySpecialForm = types_1.AnyType.createSpecialForm();
@@ -509,7 +500,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
     }
-    function getTypeOfExpression(node, flags = 0 /* EvaluatorFlags.None */, inferenceContext) {
+    function getTypeOfExpression(node, flags = 0 /* EvaluatorFlags.None */, inferenceContext, signatureTracker) {
         // Is this type already cached?
         const cacheEntry = readTypeCacheEntry(node);
         if (cacheEntry &&
@@ -546,10 +537,56 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // typeshed stubs, do so here. It would be better to fetch this when it's
         // needed in assignType, but we don't have access to the parse tree
         // at that point.
-        initializedBasicTypes(node);
+        initializePrefetchedTypes(node);
+        let typeResult = getTypeOfExpressionCore(node, flags, inferenceContext, signatureTracker);
+        // Should we disable type promotions for bytes?
+        if ((0, types_1.isInstantiableClass)(typeResult.type) &&
+            typeResult.type.includePromotions &&
+            !typeResult.type.includeSubclasses &&
+            types_1.ClassType.isBuiltIn(typeResult.type, 'bytes')) {
+            if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.disableBytesTypePromotions) {
+                typeResult = {
+                    ...typeResult,
+                    type: types_1.ClassType.cloneRemoveTypePromotions(typeResult.type),
+                };
+            }
+        }
+        // Don't allow speculative caching for assignment expressions because
+        // the target name node won't have a corresponding type cached speculatively.
+        const allowSpeculativeCaching = node.nodeType !== 4 /* ParseNodeType.AssignmentExpression */;
+        writeTypeCache(node, typeResult, flags, inferenceContext, allowSpeculativeCaching);
+        // If there was an expected type, make sure that the result type is compatible.
+        if (inferenceContext &&
+            !(0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) &&
+            !(0, types_1.isNever)(inferenceContext.expectedType)) {
+            expectedTypeCache.set(node.id, inferenceContext.expectedType);
+            // If this is a generic function and there is a signature tracker,
+            // make sure the signature is unique.
+            if (signatureTracker && (0, types_1.isFunction)(typeResult.type)) {
+                typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, signatureTracker, node.start);
+            }
+            if (!typeResult.isIncomplete && !typeResult.expectedTypeDiagAddendum) {
+                const diag = new diagnostic_1.DiagnosticAddendum();
+                // Make sure the resulting type is assignable to the expected type.
+                if (!assignType(inferenceContext.expectedType, typeResult.type, diag, 
+                /* destTypeVarContext */ undefined, 
+                /* srcTypeVarContext */ undefined, 1024 /* AssignTypeFlags.IgnoreTypeVarScope */)) {
+                    typeResult.typeErrors = true;
+                    typeResult.expectedTypeDiagAddendum = diag;
+                    diag.addTextRange(node);
+                }
+            }
+        }
+        if (printExpressionTypes) {
+            printExpressionSpaceCount--;
+            console.log(`${getPrintExpressionTypesSpaces()}${ParseTreeUtils.printExpression(node)} (${getLineNum(node)}): Post ${printType(typeResult.type)}${typeResult.isIncomplete ? ' Incomplete' : ''}`);
+        }
+        return typeResult;
+    }
+    // This is a helper function that implements the core of getTypeOfExpression.
+    function getTypeOfExpressionCore(node, flags = 0 /* EvaluatorFlags.None */, inferenceContext, signatureTracker) {
         let typeResult;
         let expectingInstantiable = (flags & 128 /* EvaluatorFlags.ExpectingInstantiableType */) !== 0;
-        let allowSpeculativeCaching = true;
         switch (node.nodeType) {
             case 38 /* ParseNodeType.Name */: {
                 typeResult = getTypeOfName(node, flags);
@@ -559,19 +596,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = getTypeOfMemberAccess(node, flags);
                 break;
             }
-            case 24 /* ParseNodeType.Index */: {
+            case 27 /* ParseNodeType.Index */: {
                 typeResult = getTypeOfIndex(node, flags);
                 break;
             }
             case 9 /* ParseNodeType.Call */: {
-                typeResult = getTypeOfCall(node, flags, inferenceContext);
+                typeResult = getTypeOfCall(node, flags, inferenceContext, signatureTracker);
                 break;
             }
             case 52 /* ParseNodeType.Tuple */: {
-                typeResult = getTypeOfTuple(node, flags, inferenceContext);
+                typeResult = getTypeOfTuple(node, flags, inferenceContext, signatureTracker);
                 break;
             }
-            case 11 /* ParseNodeType.Constant */: {
+            case 14 /* ParseNodeType.Constant */: {
                 typeResult = getTypeOfConstant(node, flags);
                 break;
             }
@@ -589,7 +626,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = getTypeOfNumber(node, typeResult);
                 break;
             }
-            case 18 /* ParseNodeType.Ellipsis */: {
+            case 21 /* ParseNodeType.Ellipsis */: {
                 typeResult = getTypeOfEllipsis(flags, typeResult, node);
                 break;
             }
@@ -611,7 +648,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = (0, operations_1.getTypeOfAugmentedAssignment)(evaluatorInterface, node, inferenceContext);
                 break;
             }
-            case 31 /* ParseNodeType.List */:
+            case 34 /* ParseNodeType.List */:
             case 45 /* ParseNodeType.Set */: {
                 typeResult = getTypeOfListOrSet(node, flags, inferenceContext);
                 break;
@@ -628,20 +665,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = (0, operations_1.getTypeOfTernaryOperation)(evaluatorInterface, node, flags, inferenceContext);
                 break;
             }
-            case 32 /* ParseNodeType.ListComprehension */: {
-                typeResult = getTypeOfListComprehension(node, inferenceContext);
+            case 11 /* ParseNodeType.Comprehension */: {
+                typeResult = getTypeOfComprehension(node, flags, inferenceContext);
                 break;
             }
-            case 15 /* ParseNodeType.Dictionary */: {
+            case 18 /* ParseNodeType.Dictionary */: {
                 typeResult = getTypeOfDictionary(node, flags, inferenceContext);
                 break;
             }
-            case 30 /* ParseNodeType.Lambda */: {
+            case 33 /* ParseNodeType.Lambda */: {
                 typeResult = getTypeOfLambda(node, inferenceContext);
                 break;
             }
             case 3 /* ParseNodeType.Assignment */: {
-                typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext);
+                typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext, signatureTracker);
                 assignTypeToExpression(node.leftExpression, typeResult.type, !!typeResult.isIncomplete, node.rightExpression, 
                 /* ignoreEmptyContainers */ true, 
                 /* allowAssignmentToFinalVar */ true);
@@ -651,12 +688,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if ((flags & 256 /* EvaluatorFlags.ExpectingTypeAnnotation */) !== 0) {
                     addError(localize_1.LocMessage.walrusNotAllowed(), node);
                 }
-                typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext);
+                typeResult = getTypeOfExpression(node.rightExpression, flags, inferenceContext, signatureTracker);
                 assignTypeToExpression(node.name, typeResult.type, !!typeResult.isIncomplete, node.rightExpression, 
                 /* ignoreEmptyContainers */ true);
-                // Don't allow speculative caching for assignment expressions because
-                // the target name node won't have a corresponding type cached speculatively.
-                allowSpeculativeCaching = false;
                 break;
             }
             case 60 /* ParseNodeType.Yield */: {
@@ -681,7 +715,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 break;
             }
             case 49 /* ParseNodeType.String */:
-            case 27 /* ParseNodeType.FormatString */: {
+            case 30 /* ParseNodeType.FormatString */: {
                 typeResult = getTypeOfString(node);
                 break;
             }
@@ -707,45 +741,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (expectingInstantiable) {
             validateTypeIsInstantiable(typeResult, flags, node);
         }
-        // Should we disable type promotions for bytes?
-        if ((0, types_1.isInstantiableClass)(typeResult.type) &&
-            typeResult.type.includePromotions &&
-            !typeResult.type.includeSubclasses &&
-            types_1.ClassType.isBuiltIn(typeResult.type, 'bytes')) {
-            if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.disableBytesTypePromotions) {
-                typeResult = {
-                    ...typeResult,
-                    type: types_1.ClassType.cloneRemoveTypePromotions(typeResult.type),
-                };
-            }
-        }
-        writeTypeCache(node, typeResult, flags, inferenceContext, allowSpeculativeCaching);
-        // If there was an expected type, make sure that the result type is compatible.
-        if (inferenceContext &&
-            !(0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) &&
-            !(0, types_1.isNever)(inferenceContext.expectedType)) {
-            expectedTypeCache.set(node.id, inferenceContext.expectedType);
-            // If this is a generic function and there is a signature tracker,
-            // make sure the signature is unique.
-            if (inferenceContext.signatureTracker && (0, types_1.isFunction)(typeResult.type)) {
-                typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, inferenceContext.signatureTracker, node.start);
-            }
-            if (!typeResult.isIncomplete && !typeResult.expectedTypeDiagAddendum) {
-                const diag = new diagnostic_1.DiagnosticAddendum();
-                // Make sure the resulting type is assignable to the expected type.
-                if (!assignType(inferenceContext.expectedType, typeResult.type, diag, 
-                /* destTypeVarContext */ undefined, 
-                /* srcTypeVarContext */ undefined, 1024 /* AssignTypeFlags.IgnoreTypeVarScope */)) {
-                    typeResult.typeErrors = true;
-                    typeResult.expectedTypeDiagAddendum = diag;
-                    diag.addTextRange(node);
-                }
-            }
-        }
-        if (printExpressionTypes) {
-            printExpressionSpaceCount--;
-            console.log(`${getPrintExpressionTypesSpaces()}${ParseTreeUtils.printExpression(node)} (${getLineNum(node)}): Post ${printType(typeResult.type)}${typeResult.isIncomplete ? ' Incomplete' : ''}`);
-        }
         return typeResult;
     }
     // Reports the case where a function or class has been decorated with
@@ -942,7 +937,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             });
             const isBytes = (node.strings[0].token.flags & 32 /* StringTokenFlags.Bytes */) !== 0;
             // Don't create a literal type if it's an f-string.
-            if (node.strings.some((str) => str.nodeType === 27 /* ParseNodeType.FormatString */)) {
+            if (node.strings.some((str) => str.nodeType === 30 /* ParseNodeType.FormatString */)) {
                 if (isLiteralString) {
                     const literalStringType = getTypingType(node, 'LiteralString');
                     if (literalStringType && (0, types_1.isInstantiableClass)(literalStringType)) {
@@ -970,7 +965,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let typeResult;
         let isIncomplete = false;
         // Don't create a literal type if it's an f-string.
-        if (node.nodeType === 27 /* ParseNodeType.FormatString */) {
+        if (node.nodeType === 30 /* ParseNodeType.FormatString */) {
             let isLiteralString = true;
             // If all of the format expressions are of type LiteralString, then
             // the resulting formatted string is also LiteralString.
@@ -1036,8 +1031,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 if (types_1.ClassType.isBuiltIn(subtype, 'LiteralString')) {
                     // Handle "LiteralString" specially.
-                    if (strClassType && (0, types_1.isInstantiableClass)(strClassType)) {
-                        let strInstance = types_1.ClassType.cloneAsInstance(strClassType);
+                    if (strClass && (0, types_1.isInstantiableClass)(strClass)) {
+                        let strInstance = types_1.ClassType.cloneAsInstance(strClass);
                         if (subtype.condition) {
                             strInstance = types_1.TypeBase.cloneForCondition(strInstance, (0, typeUtils_1.getTypeCondition)(subtype));
                         }
@@ -1536,7 +1531,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             let callResult;
             useSpeculativeMode(callNode, () => {
                 callResult = validateFunctionArguments(exprNode, argList, { type }, new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(type)), 
-                /* skipUnknownArgCheck */ true);
+                /* skipUnknownArgCheck */ true, 
+                /* inferenceContext */ undefined, 
+                /* signatureTracker */ undefined);
             });
             signatures.push({
                 type: expandTypedKwargs(type),
@@ -1727,7 +1724,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 break;
             }
-            case 24 /* ParseNodeType.Index */: {
+            case 27 /* ParseNodeType.Index */: {
                 const baseType = makeTopLevelTypeVarsConcrete(getTypeOfExpression(expression.baseExpression, 2 /* EvaluatorFlags.IndexBaseDefaults */).type);
                 if (baseType && (0, types_1.isClassInstance)(baseType)) {
                     const setItemType = getBoundMagicMethod(baseType, '__setitem__');
@@ -1780,12 +1777,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // (object that provides an __await__ that returns a generator object).
     // If errorNode is undefined, no errors are reported.
     function getTypeOfAwaitable(type, errorNode) {
-        if (!awaitableProtocolType ||
-            !(0, types_1.isInstantiableClass)(awaitableProtocolType) ||
-            awaitableProtocolType.details.typeParameters.length !== 1) {
+        if (!awaitableClass ||
+            !(0, types_1.isInstantiableClass)(awaitableClass) ||
+            awaitableClass.details.typeParameters.length !== 1) {
             return types_1.UnknownType.create();
         }
-        const awaitableProtocolObj = types_1.ClassType.cloneAsInstance(awaitableProtocolType);
+        const awaitableProtocolObj = types_1.ClassType.cloneAsInstance(awaitableClass);
         return (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
             subtype = makeTopLevelTypeVarsConcrete(subtype);
             if ((0, types_1.isAnyOrUnknown)(subtype)) {
@@ -1846,8 +1843,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     if (!isAsync && (0, types_1.isClassInstance)(subtype)) {
                         const getItemReturnType = getTypeOfMagicMethodCall(subtype, '__getitem__', [
                             {
-                                type: intClassType && (0, types_1.isInstantiableClass)(intClassType)
-                                    ? types_1.ClassType.cloneAsInstance(intClassType)
+                                type: intClass && (0, types_1.isInstantiableClass)(intClass)
+                                    ? types_1.ClassType.cloneAsInstance(intClass)
                                     : types_1.UnknownType.create(),
                             },
                         ], errorNode);
@@ -1876,7 +1873,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 // know anything more about them.
                                 nextReturnType = (0, typeUtils_1.mapSubtypes)(nextReturnType, (returnSubtype) => {
                                     if ((0, types_1.isTypeVar)(returnSubtype) && (0, types_1.isUnpackedVariadicTypeVar)(returnSubtype)) {
-                                        return objectType !== null && objectType !== void 0 ? objectType : types_1.UnknownType.create();
+                                        return getObjectType();
                                     }
                                     return returnSubtype;
                                 });
@@ -1977,21 +1974,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return isTypeHashable;
     }
     function getTypedDictClassType() {
-        return typedDictPrivateClassType && (0, types_1.isInstantiableClass)(typedDictPrivateClassType)
-            ? typedDictPrivateClassType
-            : undefined;
+        return typedDictPrivateClass && (0, types_1.isInstantiableClass)(typedDictPrivateClass) ? typedDictPrivateClass : undefined;
     }
     function getTupleClassType() {
-        return tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType) ? tupleClassType : undefined;
+        return tupleClass && (0, types_1.isInstantiableClass)(tupleClass) ? tupleClass : undefined;
     }
     function getObjectType() {
-        return objectType !== null && objectType !== void 0 ? objectType : types_1.UnknownType.create();
+        return objectClass ? (0, typeUtils_1.convertToInstance)(objectClass) : types_1.UnknownType.create();
     }
     function getNoneType() {
-        return noneType !== null && noneType !== void 0 ? noneType : types_1.UnknownType.create();
+        return noneTypeClass ? (0, typeUtils_1.convertToInstance)(noneTypeClass) : types_1.UnknownType.create();
     }
     function getUnionClassType() {
-        return unionClassType !== null && unionClassType !== void 0 ? unionClassType : types_1.UnknownType.create();
+        return unionTypeClass !== null && unionTypeClass !== void 0 ? unionTypeClass : types_1.UnknownType.create();
     }
     function getTypingType(node, symbolName) {
         var _a;
@@ -2016,11 +2011,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return getEffectiveTypeOfSymbol(symbol);
     }
     function checkCodeFlowTooComplex(node) {
-        const scopeNode = node.nodeType === 28 /* ParseNodeType.Function */ ? node : ParseTreeUtils.getExecutionScopeNode(node);
+        const scopeNode = node.nodeType === 31 /* ParseNodeType.Function */ ? node : ParseTreeUtils.getExecutionScopeNode(node);
         const codeComplexity = AnalyzerNodeInfo.getCodeFlowComplexity(scopeNode);
         if (codeComplexity > exports.maxCodeComplexity) {
             let errorRange = scopeNode;
-            if (scopeNode.nodeType === 28 /* ParseNodeType.Function */) {
+            if (scopeNode.nodeType === 31 /* ParseNodeType.Function */) {
                 errorRange = scopeNode.name;
             }
             else if (scopeNode.nodeType === 36 /* ParseNodeType.Module */) {
@@ -2093,7 +2088,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // of a Literal['xxx'] statement. If so, we will not treat
     // the string as a normal forward-declared type annotation.
     function isAnnotationLiteralValue(node) {
-        if (node.parent && node.parent.nodeType === 24 /* ParseNodeType.Index */) {
+        if (node.parent && node.parent.nodeType === 27 /* ParseNodeType.Index */) {
             const baseType = getTypeOfExpression(node.parent.baseExpression).type;
             if (baseType && (0, types_1.isInstantiableClass)(baseType)) {
                 if (types_1.ClassType.isSpecialBuiltIn(baseType, 'Literal')) {
@@ -2413,7 +2408,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
     }
     function assignTypeToTupleOrListNode(target, type, isTypeIncomplete, srcExpr) {
-        const targetExpressions = target.nodeType === 31 /* ParseNodeType.List */ ? target.entries : target.expressions;
+        const targetExpressions = target.nodeType === 34 /* ParseNodeType.List */ ? target.entries : target.expressions;
         // Initialize the array of target types, one for each target.
         const targetTypes = new Array(targetExpressions.length);
         for (let i = 0; i < targetExpressions.length; i++) {
@@ -2447,7 +2442,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     if (sourceEntryTypes.length > targetTypes.length) {
                         const removedEntries = sourceEntryTypes.splice(targetUnpackIndex, sourceEntryTypes.length - targetTypes.length + 1);
                         let combinedTypes = (0, types_1.combineTypes)(removedEntries);
-                        if (target.nodeType === 31 /* ParseNodeType.List */) {
+                        if (target.nodeType === 34 /* ParseNodeType.List */) {
                             combinedTypes = stripLiteralValue(combinedTypes);
                         }
                         sourceEntryTypes.splice(targetUnpackIndex, 0, combinedTypes);
@@ -2464,7 +2459,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // Have we accounted for all of the targets and sources? If not, we have a size mismatch.
                 if (sourceEntryTypes.length !== targetExpressions.length) {
                     const subDiag = diagAddendum.createAddendum();
-                    subDiag.addMessage((target.nodeType === 31 /* ParseNodeType.List */
+                    subDiag.addMessage((target.nodeType === 34 /* ParseNodeType.List */
                         ? localize_1.LocAddendum.listAssignmentMismatch()
                         : localize_1.LocAddendum.tupleAssignmentMismatch()).format({
                         type: printType(subtype),
@@ -2487,7 +2482,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         });
         if (!diagAddendum.isEmpty()) {
-            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssignmentType, (target.nodeType === 31 /* ParseNodeType.List */
+            addDiagnostic(diagnosticRules_1.DiagnosticRule.reportAssignmentType, (target.nodeType === 34 /* ParseNodeType.List */
                 ? localize_1.LocMessage.listAssignmentMismatch()
                 : localize_1.LocMessage.tupleAssignmentMismatch()).format({
                 type: printType(type),
@@ -2536,22 +2531,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // TypeVar, only the conditions that match the filter will be included.
     function makeTopLevelTypeVarsConcrete(type, makeParamSpecsConcrete = false, conditionFilter) {
         return (0, typeUtils_1.mapSubtypes)(type, (subtype) => {
-            var _a, _b;
+            var _a;
             if ((0, types_1.isParamSpec)(subtype)) {
                 if (subtype.paramSpecAccess === 'args') {
-                    if (objectType && (0, types_1.isClassInstance)(objectType)) {
-                        return makeTupleObject([{ type: objectType, isUnbounded: true }]);
-                    }
-                    return types_1.UnknownType.create();
+                    return makeTupleObject([{ type: getObjectType(), isUnbounded: true }]);
                 }
                 else if (subtype.paramSpecAccess === 'kwargs') {
-                    if (dictClassType &&
-                        (0, types_1.isInstantiableClass)(dictClassType) &&
-                        strClassType &&
-                        (0, types_1.isInstantiableClass)(strClassType) &&
-                        objectType &&
-                        (0, types_1.isClassInstance)(objectType)) {
-                        return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(dictClassType, [(0, typeUtils_1.convertToInstance)(strClassType), objectType], 
+                    if (dictClass && (0, types_1.isInstantiableClass)(dictClass) && strClass && (0, types_1.isInstantiableClass)(strClass)) {
+                        return types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(dictClass, [(0, typeUtils_1.convertToInstance)(strClass), getObjectType()], 
                         /* isTypeArgumentExplicit */ true));
                     }
                     return types_1.UnknownType.create();
@@ -2569,18 +2556,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // If it's in a union, convert to type or object.
                 if (subtype.isVariadicInUnion) {
                     if (types_1.TypeBase.isInstantiable(subtype)) {
-                        if (typeClassType && (0, types_1.isInstantiableClass)(typeClassType)) {
-                            return typeClassType;
+                        if (typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
+                            return typeClass;
                         }
                     }
-                    else if (objectType) {
-                        return objectType;
+                    else {
+                        return getObjectType();
                     }
                     return types_1.AnyType.create();
                 }
                 // Fall back to "*tuple[object, ...]".
-                return makeTupleObject([{ type: objectType !== null && objectType !== void 0 ? objectType : types_1.UnknownType.create(), isUnbounded: true }], 
-                /* isUnpacked */ true);
+                return makeTupleObject([{ type: getObjectType(), isUnbounded: true }], /* isUnpacked */ true);
             }
             if ((0, types_1.isTypeVar)(subtype)) {
                 // If this is a recursive type alias placeholder
@@ -2613,7 +2599,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return types_1.AnyType.create();
                 }
                 // Fall back to a bound of "object" if no bound is provided.
-                let boundType = (_b = (_a = subtype.details.boundType) !== null && _a !== void 0 ? _a : objectType) !== null && _b !== void 0 ? _b : types_1.UnknownType.create();
+                let boundType = (_a = subtype.details.boundType) !== null && _a !== void 0 ? _a : getObjectType();
                 boundType = types_1.TypeBase.isInstantiable(subtype) ? (0, typeUtils_1.convertToInstantiable)(boundType) : boundType;
                 return (0, typeUtils_1.addConditionToType)(boundType, [{ typeVar: subtype, constraintIndex: 0 }]);
             }
@@ -2768,7 +2754,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 assignTypeToMemberAccessNode(target, type, isTypeIncomplete, srcExpr, expectedTypeDiagAddendum);
                 break;
             }
-            case 24 /* ParseNodeType.Index */: {
+            case 27 /* ParseNodeType.Index */: {
                 const baseTypeResult = getTypeOfExpression(target.baseExpression, 2 /* EvaluatorFlags.IndexBaseDefaults */);
                 getTypeOfIndexWithBaseType(target, baseTypeResult, {
                     method: 'set',
@@ -2779,7 +2765,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 writeTypeCache(target, { type, isIncomplete: isTypeIncomplete }, 0 /* EvaluatorFlags.None */);
                 break;
             }
-            case 31 /* ParseNodeType.List */:
+            case 34 /* ParseNodeType.List */:
             case 52 /* ParseNodeType.Tuple */: {
                 assignTypeToTupleOrListNode(target, type, isTypeIncomplete, srcExpr);
                 break;
@@ -2856,7 +2842,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 suppressDiagnostics(node.typeExpression, () => {
                                     callResult = (0, constructors_1.validateConstructorArguments)(evaluatorInterface, node.typeExpression, [], concreteSubtype, 
                                     /* skipUnknownArgCheck */ false, 
-                                    /* inferenceContext */ undefined);
+                                    /* inferenceContext */ undefined, 
+                                    /* signatureTracker */ undefined);
                                 });
                                 if (callResult && callResult.argumentErrors) {
                                     diagAddendum.addMessage(localize_1.LocMessage.exceptionTypeNotInstantiable().format({
@@ -2905,7 +2892,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 writeTypeCache(node, resultToCache, 0 /* EvaluatorFlags.None */);
                 break;
             }
-            case 24 /* ParseNodeType.Index */: {
+            case 27 /* ParseNodeType.Index */: {
                 const baseTypeResult = getTypeOfExpression(node.baseExpression, 2 /* EvaluatorFlags.IndexBaseDefaults */);
                 getTypeOfIndexWithBaseType(node, baseTypeResult, { method: 'del' }, 0 /* EvaluatorFlags.None */);
                 writeTypeCache(node, { type: types_1.UnboundType.create() }, 0 /* EvaluatorFlags.None */);
@@ -3155,8 +3142,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // Find the parse node associated with the scope that is just inside of the
             // scope that declares the captured variable.
             const innerScopeNode = ScopeUtils.findTopNodeInScope(node, scopeHierarchy[scopeHierarchy.length - 2]);
-            if ((innerScopeNode === null || innerScopeNode === void 0 ? void 0 : innerScopeNode.nodeType) === 28 /* ParseNodeType.Function */ ||
-                (innerScopeNode === null || innerScopeNode === void 0 ? void 0 : innerScopeNode.nodeType) === 30 /* ParseNodeType.Lambda */ ||
+            if ((innerScopeNode === null || innerScopeNode === void 0 ? void 0 : innerScopeNode.nodeType) === 31 /* ParseNodeType.Function */ ||
+                (innerScopeNode === null || innerScopeNode === void 0 ? void 0 : innerScopeNode.nodeType) === 33 /* ParseNodeType.Lambda */ ||
                 (innerScopeNode === null || innerScopeNode === void 0 ? void 0 : innerScopeNode.nodeType) === 10 /* ParseNodeType.Class */) {
                 const innerScopeCodeFlowNode = AnalyzerNodeInfo.getFlowNode(innerScopeNode);
                 if (innerScopeCodeFlowNode) {
@@ -3229,7 +3216,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             const memberName = node.parent.memberName.value;
                             if (memberName === 'args' || memberName === 'kwargs') {
                                 const outerFunctionScope = ParseTreeUtils.getEnclosingClassOrFunction(enclosingScope);
-                                if ((outerFunctionScope === null || outerFunctionScope === void 0 ? void 0 : outerFunctionScope.nodeType) === 28 /* ParseNodeType.Function */) {
+                                if ((outerFunctionScope === null || outerFunctionScope === void 0 ? void 0 : outerFunctionScope.nodeType) === 31 /* ParseNodeType.Function */) {
                                     enclosingScope = outerFunctionScope;
                                 }
                                 else if (!scopedTypeVarInfo.type.scopeId) {
@@ -3249,7 +3236,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                     container: enclosingScope.name.value,
                                 }), node);
                             }
-                            type = types_1.TypeVarType.cloneForScopeId(type, ParseTreeUtils.getScopeIdForNode(enclosingScope), enclosingScope.name.value, enclosingScope.nodeType === 28 /* ParseNodeType.Function */
+                            type = types_1.TypeVarType.cloneForScopeId(type, ParseTreeUtils.getScopeIdForNode(enclosingScope), enclosingScope.name.value, enclosingScope.nodeType === 31 /* ParseNodeType.Function */
                                 ? 1 /* TypeVarScopeType.Function */
                                 : 0 /* TypeVarScopeType.Class */);
                         }
@@ -3320,7 +3307,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (param.details.isDefaultExplicit || param.details.isParamSpec) {
                     defaultType = (0, typeUtils_1.applySolvedTypeVars)(param, typeVarContext, { unknownIfNotFound: true });
                 }
-                else if (param.details.isVariadic && tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
+                else if (param.details.isVariadic && tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
                     defaultType = makeTupleObject([{ type: types_1.UnknownType.create(), isUnbounded: true }], 
                     /* isUnpackedTuple */ true);
                 }
@@ -3360,7 +3347,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 scopeUsesTypeParameterSyntax = !!curNode.typeParameters;
                 nestedClassCount++;
             }
-            else if (curNode.nodeType === 28 /* ParseNodeType.Function */) {
+            else if (curNode.nodeType === 31 /* ParseNodeType.Function */) {
                 const functionType = getTypeOfFunctionPredecorated(curNode);
                 if (functionType) {
                     const functionDetails = functionType.details;
@@ -3724,8 +3711,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         // be reported elsewhere.
                         return undefined;
                     }
-                    if ((0, typeUtils_1.isNoneInstance)(subtype) && noneType && (0, types_1.isClassInstance)(noneType)) {
-                        const typeResult = getTypeOfBoundMember(node.memberName, noneType, memberName, usage, diag);
+                    if ((0, typeUtils_1.isNoneInstance)(subtype)) {
+                        (0, debug_1.assert)((0, types_1.isClassInstance)(subtype));
+                        const typeResult = getTypeOfBoundMember(node.memberName, subtype, memberName, usage, diag);
                         if (typeResult && !typeResult.typeErrors) {
                             type = (0, typeUtils_1.addConditionToType)(typeResult.type, (0, typeUtils_1.getTypeCondition)(baseType));
                             if (typeResult.isIncomplete) {
@@ -3767,7 +3755,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                 }
                 else {
-                    type = getTypeOfMemberAccessWithBaseType(node, { type: functionObj !== null && functionObj !== void 0 ? functionObj : types_1.AnyType.create() }, usage, flags).type;
+                    type = getTypeOfMemberAccessWithBaseType(node, { type: functionClass ? (0, typeUtils_1.convertToInstance)(functionClass) : types_1.UnknownType.create() }, usage, flags).type;
                 }
                 break;
             }
@@ -4001,7 +3989,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // If a Final instance variable is declared in the class body but is
                 // being assigned within an __init__ method, it's allowed.
                 const enclosingFunctionNode = ParseTreeUtils.getEnclosingFunction(errorNode);
-                if (!enclosingFunctionNode || enclosingFunctionNode.name.value !== '__init__') {
+                if (!enclosingFunctionNode ||
+                    enclosingFunctionNode.name.value !== '__init__' ||
+                    finalVarTypeDecl.inferredTypeSource !== undefined ||
+                    (0, types_1.isInstantiableClass)(classType)) {
                     diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocMessage.finalReassigned().format({ name: memberName }));
                     isDescriptorError = true;
                 }
@@ -4210,7 +4201,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const callResult = suppressDiagnostics(errorNode, () => {
             return validateCallArguments(errorNode, argList, { type: methodType }, 
             /* typeVarContext */ undefined, 
-            /* skipUnknownArgCheck */ true);
+            /* skipUnknownArgCheck */ true, 
+            /* inferenceContext */ undefined, 
+            /* signatureTracker */ undefined);
         });
         // Collect deprecation information associated with the member access method.
         let deprecationInfo;
@@ -4383,8 +4376,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         argList.push({
             argumentCategory: 0 /* ArgumentCategory.Simple */,
             typeResult: {
-                type: strClassType && (0, types_1.isInstantiableClass)(strClassType)
-                    ? types_1.ClassType.cloneWithLiteral(types_1.ClassType.cloneAsInstance(strClassType), memberName)
+                type: strClass && (0, types_1.isInstantiableClass)(strClass)
+                    ? types_1.ClassType.cloneWithLiteral(types_1.ClassType.cloneAsInstance(strClass), memberName)
                     : types_1.AnyType.create(),
             },
         });
@@ -4407,7 +4400,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(accessMemberType));
         const callResult = validateCallArguments(errorNode, argList, { type: accessMemberType }, typeVarContext, 
-        /* skipUnknownArgCheck */ true);
+        /* skipUnknownArgCheck */ true, 
+        /* inferenceContext */ undefined, 
+        /* signatureTracker */ undefined);
         let isAsymmetricAccessor = false;
         if (usage.method === 'set') {
             isAsymmetricAccessor = isClassWithAsymmetricAttributeAccessor(classType);
@@ -4890,17 +4885,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     types_1.ClassType.isPartiallyEvaluated(concreteSubtype);
                 const isFinalAnnotation = (0, types_1.isInstantiableClass)(concreteSubtype) && types_1.ClassType.isBuiltIn(concreteSubtype, 'Final');
                 const isClassVarAnnotation = (0, types_1.isInstantiableClass)(concreteSubtype) && types_1.ClassType.isBuiltIn(concreteSubtype, 'ClassVar');
-                // Inlined TypedDicts are supported only for 'dict' (and not for 'Dict').
-                // This feature is currently experimental.
-                const supportsTypedDictTypeArg = AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures &&
-                    types_1.ClassType.isBuiltIn(concreteSubtype, 'dict') &&
-                    !types_1.ClassType.isBuiltIn(concreteSubtype, 'Dict');
                 let typeArgs = getTypeArgs(node, flags, {
                     isAnnotatedClass,
                     hasCustomClassGetItem: hasCustomClassGetItem || !isGenericClass,
                     isFinalAnnotation,
                     isClassVarAnnotation,
-                    supportsTypedDictTypeArg,
                 });
                 if (!isAnnotatedClass) {
                     typeArgs = adjustTypeArgumentsForVariadicTypeVar(typeArgs, concreteSubtype.details.typeParameters, node);
@@ -5048,8 +5037,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         });
     }
     function makeTupleObject(typeArgs, isUnpackedTuple = false) {
-        if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
-            return (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(tupleClassType, typeArgs, /* isTypeArgumentExplicit */ true, isUnpackedTuple));
+        if (tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
+            return (0, typeUtils_1.convertToInstance)((0, typeUtils_1.specializeTupleClass)(tupleClass, typeArgs, /* isTypeArgumentExplicit */ true, isUnpackedTuple));
         }
         return types_1.UnknownType.create();
     }
@@ -5209,7 +5198,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             useSpeculativeMode(node, () => {
                 callResult = validateCallArguments(node, argList, { type: itemMethodType }, 
                 /* typeVarContext */ undefined, 
-                /* skipUnknownArgCheck */ true);
+                /* skipUnknownArgCheck */ true, 
+                /* inferenceContext */ undefined, 
+                /* signatureTracker */ undefined);
                 if (callResult.argumentErrors) {
                     // If the object supports "__index__" magic method, convert
                     // the index to an int and try again.
@@ -5223,7 +5214,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                 altArgList[0].typeResult = { type: intType };
                             }
                         }
-                        callResult = validateCallArguments(node, altArgList, { type: itemMethodType });
+                        callResult = validateCallArguments(node, altArgList, { type: itemMethodType }, 
+                        /* typeVarContext */ undefined, 
+                        /* skipUnknownArgCheck */ true, 
+                        /* inferenceContext */ undefined, 
+                        /* signatureTracker */ undefined);
                         // We were successful, so replace the arg list.
                         if (!callResult.argumentErrors) {
                             argList = altArgList;
@@ -5234,7 +5229,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         callResult = validateCallArguments(node, argList, { type: itemMethodType }, 
         /* typeVarContext */ undefined, 
-        /* skipUnknownArgCheck */ true);
+        /* skipUnknownArgCheck */ true, 
+        /* inferenceContext */ undefined, 
+        /* signatureTracker */ undefined);
         return {
             type: (_d = callResult.returnType) !== null && _d !== void 0 ? _d : types_1.UnknownType.create(),
             isIncomplete: !!callResult.isTypeIncomplete,
@@ -5288,9 +5285,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function getTypeArgs(node, flags, options) {
         const typeArgs = [];
         let adjFlags = flags;
-        if ((options === null || options === void 0 ? void 0 : options.isFinalAnnotation) || (options === null || options === void 0 ? void 0 : options.isClassVarAnnotation)) {
+        if (options === null || options === void 0 ? void 0 : options.isFinalAnnotation) {
             adjFlags |= 131072 /* EvaluatorFlags.DisallowClassVar */ | 16 /* EvaluatorFlags.DisallowFinal */;
         }
+        else if (options === null || options === void 0 ? void 0 : options.isClassVarAnnotation) {
+            adjFlags |= 131072 /* EvaluatorFlags.DisallowClassVar */;
+            // If the annotation is a variable within the body of a dataclass, a
+            // Final is allowed within the ClassVar annotation. In all other cases,
+            // it's disallowed.
+            let disallowFinal = true;
+            const enclosingClassNode = ParseTreeUtils.getEnclosingClass(node, /* stopeAtFunction */ true);
+            if (enclosingClassNode) {
+                const classTypeInfo = getTypeOfClass(enclosingClassNode);
+                if (classTypeInfo && types_1.ClassType.isDataClass(classTypeInfo.classType)) {
+                    disallowFinal = false;
+                }
+            }
+            if (disallowFinal) {
+                adjFlags |= 16 /* EvaluatorFlags.DisallowFinal */;
+            }
+        }
         else {
             adjFlags &= ~(2 /* EvaluatorFlags.DoNotSpecialize */ |
                 32 /* EvaluatorFlags.DisallowParamSpec */ |
@@ -5335,7 +5349,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 };
             }
             else {
-                typeResult = getTypeArg(expr, adjFlags, !!(options === null || options === void 0 ? void 0 : options.supportsTypedDictTypeArg) && argIndex === 0);
+                typeResult = getTypeArg(expr, adjFlags);
             }
             return typeResult;
         };
@@ -5379,7 +5393,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return typeArgs;
     }
-    function getTypeArg(node, flags, supportsDictExpression) {
+    function getTypeArg(node, flags) {
         let typeResult;
         let adjustedFlags = flags |
             128 /* EvaluatorFlags.ExpectingInstantiableType */ |
@@ -5389,7 +5403,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (fileInfo.isStubFile) {
             adjustedFlags |= 4 /* EvaluatorFlags.AllowForwardReferences */;
         }
-        if (node.nodeType === 31 /* ParseNodeType.List */) {
+        if (node.nodeType === 34 /* ParseNodeType.List */) {
             typeResult = {
                 type: types_1.UnknownType.create(),
                 typeList: node.entries.map((entry) => {
@@ -5400,20 +5414,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // Set the node's type so it isn't reevaluated later.
             setTypeResultForNode(node, { type: types_1.UnknownType.create() });
         }
-        else if (node.nodeType === 15 /* ParseNodeType.Dictionary */ && supportsDictExpression) {
-            const inlinedTypeDict = typedDictClassType && (0, types_1.isInstantiableClass)(typedDictClassType)
-                ? (0, typedDicts_1.createTypedDictTypeInlined)(evaluatorInterface, node, typedDictClassType)
-                : undefined;
-            const keyTypeFallback = strClassType && (0, types_1.isInstantiableClass)(strClassType) ? strClassType : types_1.UnknownType.create();
-            typeResult = {
-                type: keyTypeFallback,
-                inlinedTypeDict,
-                node,
-            };
-        }
         else {
             typeResult = { ...getTypeOfExpression(node, adjustedFlags), node };
-            if (node.nodeType === 15 /* ParseNodeType.Dictionary */) {
+            if (node.nodeType === 18 /* ParseNodeType.Dictionary */) {
                 addError(localize_1.LocMessage.dictInAnnotation(), node);
             }
             if ((flags & 131072 /* EvaluatorFlags.DisallowClassVar */) !== 0) {
@@ -5425,7 +5428,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return typeResult;
     }
-    function getTypeOfTuple(node, flags, inferenceContext) {
+    function getTypeOfTuple(node, flags, inferenceContext, signatureTracker) {
         var _a;
         if ((flags & 256 /* EvaluatorFlags.ExpectingTypeAnnotation */) !== 0 &&
             ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) !== 1 /* ParseNodeType.Argument */) {
@@ -5442,6 +5445,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             !inferenceContext) {
             return { type: makeTupleObject([]), isEmptyTupleShorthand: true };
         }
+        flags &= ~(256 /* EvaluatorFlags.ExpectingTypeAnnotation */ |
+            8 /* EvaluatorFlags.EvaluateStringLiteralAsType */ |
+            128 /* EvaluatorFlags.ExpectingInstantiableType */);
         // If the expected type is a union, recursively call for each of the subtypes
         // to find one that matches.
         let effectiveExpectedType = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType;
@@ -5454,7 +5460,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 if (!matchingSubtype) {
                     const subtypeResult = useSpeculativeMode(node, () => {
-                        return getTypeOfTupleWithContext(node, (0, typeUtils_1.makeInferenceContext)(subtype));
+                        return getTypeOfTupleWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(subtype), 
+                        /* signatureTracker */ undefined);
                     });
                     if (subtypeResult && assignType(subtype, subtypeResult.type)) {
                         matchingSubtype = subtype;
@@ -5466,14 +5473,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let expectedTypeDiagAddendum;
         if (effectiveExpectedType) {
-            const result = getTypeOfTupleWithContext(node, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType, 
-            /* isTypeIncomplete */ false, inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker));
+            const result = getTypeOfTupleWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType), signatureTracker);
             if (result && !result.typeErrors) {
                 return result;
             }
             expectedTypeDiagAddendum = result === null || result === void 0 ? void 0 : result.expectedTypeDiagAddendum;
         }
-        const typeResult = getTypeOfTupleInferred(node);
+        const typeResult = getTypeOfTupleInferred(node, flags);
         // If there was an expected type of Any, replace the resulting type
         // with Any rather than return a type with unknowns.
         if (expectedTypeContainsAny) {
@@ -5481,12 +5487,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { ...typeResult, expectedTypeDiagAddendum };
     }
-    function getTypeOfTupleWithContext(node, inferenceContext) {
+    function getTypeOfTupleWithContext(node, flags, inferenceContext, signatureTracker) {
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         if (!(0, types_1.isClassInstance)(inferenceContext.expectedType)) {
             return undefined;
         }
-        if (!tupleClassType || !(0, types_1.isInstantiableClass)(tupleClassType)) {
+        if (!tupleClass || !(0, types_1.isInstantiableClass)(tupleClass)) {
             return undefined;
         }
         // Build an array of expected types.
@@ -5506,11 +5512,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
         else {
-            const tupleTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(tupleClassType));
-            if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, types_1.ClassType.cloneAsInstance(tupleClassType), inferenceContext.expectedType, tupleTypeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node), node.start)) {
+            const tupleTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(tupleClass));
+            if (!(0, constraintSolver_1.populateTypeVarContextBasedOnExpectedType)(evaluatorInterface, types_1.ClassType.cloneAsInstance(tupleClass), inferenceContext.expectedType, tupleTypeVarContext, ParseTreeUtils.getTypeVarScopesForNode(node), node.start)) {
                 return undefined;
             }
-            const specializedTuple = (0, typeUtils_1.applySolvedTypeVars)(tupleClassType, tupleTypeVarContext);
+            const specializedTuple = (0, typeUtils_1.applySolvedTypeVars)(tupleClass, tupleTypeVarContext);
             if (!specializedTuple.typeArguments || specializedTuple.typeArguments.length !== 1) {
                 return undefined;
             }
@@ -5519,10 +5525,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 expectedTypes.push(homogenousType);
             }
         }
-        const entryTypeResults = node.expressions.map((expr, index) => getTypeOfExpression(expr, 
-        /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : undefined, inferenceContext.isTypeIncomplete, inferenceContext.signatureTracker)));
+        const entryTypeResults = node.expressions.map((expr, index) => getTypeOfExpression(expr, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(index < expectedTypes.length ? expectedTypes[index] : undefined, inferenceContext.isTypeIncomplete), signatureTracker));
         const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
-        const type = makeTupleObject(buildTupleTypesList(entryTypeResults));
+        const type = makeTupleObject(buildTupleTypesList(entryTypeResults, /* stripLiterals */ false));
         // Copy any expected type diag addenda for precision error reporting.
         let expectedTypeDiagAddendum;
         if (entryTypeResults.some((result) => result.expectedTypeDiagAddendum)) {
@@ -5535,10 +5540,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type, expectedTypeDiagAddendum, isIncomplete };
     }
-    function getTypeOfTupleInferred(node) {
-        const entryTypeResults = node.expressions.map((expr) => getTypeOfExpression(expr));
+    function getTypeOfTupleInferred(node, flags) {
+        const entryTypeResults = node.expressions.map((expr) => getTypeOfExpression(expr, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */));
         const isIncomplete = entryTypeResults.some((result) => result.isIncomplete);
-        const type = makeTupleObject(buildTupleTypesList(entryTypeResults));
+        const type = makeTupleObject(buildTupleTypesList(entryTypeResults, (flags & 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */) !== 0));
         if (isIncomplete) {
             if ((0, typeUtils_1.getContainerDepth)(type) > maxInferredContainerDepth) {
                 return { type: types_1.UnknownType.create() };
@@ -5546,7 +5551,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type, isIncomplete };
     }
-    function buildTupleTypesList(entryTypeResults) {
+    function buildTupleTypesList(entryTypeResults, stripLiterals) {
         const entryTypes = [];
         for (const typeResult of entryTypeResults) {
             let possibleUnpackedTuple;
@@ -5575,7 +5580,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 entryTypes.push({ type: types_1.UnknownType.create(/* isIncomplete */ true), isUnbounded: false });
             }
             else {
-                entryTypes.push({ type: typeResult.type, isUnbounded: !!typeResult.unpackedType });
+                const entryType = stripLiterals ? stripLiteralValue(typeResult.type) : typeResult.type;
+                entryTypes.push({ type: entryType, isUnbounded: !!typeResult.unpackedType });
             }
         }
         // If there are multiple unbounded entries, combine all of them into a single
@@ -5588,7 +5594,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return entryTypes;
     }
-    function getTypeOfCall(node, flags, inferenceContext) {
+    function getTypeOfCall(node, flags, inferenceContext, signatureTracker) {
         var _a;
         let baseTypeResult;
         // Check for the use of `type(x)` within a type annotation. This isn't
@@ -5602,7 +5608,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.typeCallNotAllowed() + diag.getString(), node);
         }
         // Handle immediate calls of lambdas specially.
-        if (node.leftExpression.nodeType === 30 /* ParseNodeType.Lambda */) {
+        if (node.leftExpression.nodeType === 33 /* ParseNodeType.Lambda */) {
             baseTypeResult = getTypeOfLambdaForCall(node, inferenceContext);
         }
         else {
@@ -5621,8 +5627,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // If the inference context has an associated signature tracker, make sure
         // the base type of this call is not the same as one of the tracked signatures.
         // This is important for nested generic calls (e.g. "foo(foo(x))").
-        if (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) {
-            baseTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(baseTypeResult.type, inferenceContext.signatureTracker, node.leftExpression.start);
+        if (signatureTracker) {
+            baseTypeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(baseTypeResult.type, signatureTracker, node.leftExpression.start);
         }
         if (!(0, typeUtils_1.isTypeAliasPlaceholder)(baseTypeResult.type)) {
             if (node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ && node.leftExpression.value === 'super') {
@@ -5633,15 +5639,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
                 node.leftExpression.value === 'reveal_type') {
                 // Handle the implicit "reveal_type" call.
-                typeResult = getTypeOfRevealType(node, inferenceContext);
+                typeResult = getTypeOfRevealType(node, inferenceContext, signatureTracker);
             }
             else if ((0, types_1.isFunction)(baseTypeResult.type) && baseTypeResult.type.details.builtInName === 'reveal_type') {
                 // Handle the "typing.reveal_type" call.
-                typeResult = getTypeOfRevealType(node, inferenceContext);
+                typeResult = getTypeOfRevealType(node, inferenceContext, signatureTracker);
             }
             else if ((0, types_1.isFunction)(baseTypeResult.type) && baseTypeResult.type.details.builtInName === 'assert_type') {
                 // Handle the "typing.assert_type" call.
-                typeResult = getTypeOfAssertType(node, inferenceContext);
+                typeResult = getTypeOfAssertType(node, inferenceContext, signatureTracker);
             }
             else if ((0, types_1.isAnyOrUnknown)(baseTypeResult.type) &&
                 node.leftExpression.nodeType === 38 /* ParseNodeType.Name */ &&
@@ -5657,7 +5663,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             else {
                 const callResult = validateCallArguments(node, argList, baseTypeResult, 
                 /* typeVarContext */ undefined, 
-                /* skipUnknownArgCheck */ false, inferenceContext);
+                /* skipUnknownArgCheck */ false, inferenceContext, signatureTracker);
                 typeResult.type = (_a = callResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
                 if (callResult.argumentErrors) {
                     typeResult.typeErrors = true;
@@ -5709,7 +5715,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // to determine the lambda's type. It needs to be inferred from the argument
     // types instead.
     function getTypeOfLambdaForCall(node, inferenceContext) {
-        (0, debug_1.assert)(node.leftExpression.nodeType === 30 /* ParseNodeType.Lambda */);
+        (0, debug_1.assert)(node.leftExpression.nodeType === 33 /* ParseNodeType.Lambda */);
         const expectedType = types_1.FunctionType.createSynthesizedInstance('');
         expectedType.details.declaredReturnType = inferenceContext
             ? inferenceContext.expectedType
@@ -5751,7 +5757,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return typeResult;
     }
-    function getTypeOfAssertType(node, inferenceContext) {
+    function getTypeOfAssertType(node, inferenceContext, signatureTracker) {
         if (node.arguments.length !== 2 ||
             node.arguments[0].argumentCategory !== 0 /* ArgumentCategory.Simple */ ||
             node.arguments[0].name !== undefined ||
@@ -5761,7 +5767,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             return { type: types_1.UnknownType.create() };
         }
         const arg0TypeResult = getTypeOfExpression(node.arguments[0].valueExpression, 
-        /* flags */ undefined, inferenceContext);
+        /* flags */ undefined, inferenceContext, signatureTracker);
         if (arg0TypeResult.isIncomplete) {
             return { type: types_1.UnknownType.create(/* isIncomplete */ true), isIncomplete: true };
         }
@@ -5775,7 +5781,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type: arg0TypeResult.type };
     }
-    function getTypeOfRevealType(node, inferenceContext) {
+    function getTypeOfRevealType(node, inferenceContext, signatureTracker) {
         let arg0Value;
         let expectedRevealTypeNode;
         let expectedRevealType;
@@ -5812,7 +5818,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addError(localize_1.LocMessage.revealTypeArgs(), node);
             return { type: types_1.UnknownType.create() };
         }
-        const typeResult = getTypeOfExpression(arg0Value, /* flags */ undefined, inferenceContext);
+        const typeResult = getTypeOfExpression(arg0Value, /* flags */ undefined, inferenceContext, signatureTracker);
         const type = typeResult.type;
         const exprString = ParseTreeUtils.printExpression(arg0Value);
         const typeString = printType(type, { expandTypeAlias: true });
@@ -5843,7 +5849,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             scope = ScopeUtils.getScopeForNode(curNode);
             // Stop when we get a valid scope that's not a list comprehension
             // scope. That includes lambdas, functions, classes, and modules.
-            if (scope && scope.type !== 1 /* ScopeType.ListComprehension */) {
+            if (scope && scope.type !== 1 /* ScopeType.Comprehension */) {
                 break;
             }
             curNode = curNode.parent;
@@ -6019,10 +6025,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else if (effectiveTargetClass &&
                 !(0, types_1.isAnyOrUnknown)(effectiveTargetClass) &&
-                !(0, typeUtils_1.derivesFromAnyOrUnknown)(effectiveTargetClass) &&
-                objectType &&
-                (0, types_1.isClassInstance)(objectType)) {
-                resultType = types_1.ClassType.cloneAsInstantiable(objectType);
+                !(0, typeUtils_1.derivesFromAnyOrUnknown)(effectiveTargetClass)) {
+                resultType = objectClass !== null && objectClass !== void 0 ? objectClass : types_1.UnknownType.create();
             }
             else {
                 resultType = types_1.UnknownType.create();
@@ -6063,9 +6067,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return { type: resultIsInstance ? (0, typeUtils_1.convertToInstance)(nextBaseClassType) : nextBaseClassType };
                 }
                 // There's not much we can say about the type. Simply return object or type.
-                if (objectType && (0, types_1.isClassInstance)(objectType) && typeClassType && (0, types_1.isInstantiableClass)(typeClassType)) {
+                if (typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
                     return {
-                        type: resultIsInstance ? objectType : (0, typeUtils_1.convertToInstance)(typeClassType),
+                        type: resultIsInstance ? getObjectType() : (0, typeUtils_1.convertToInstance)(typeClass),
                     };
                 }
             }
@@ -6095,7 +6099,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // there will be only one argument list in expandedArgTypes, and all entries
     // (one for each argument) will be undefined. On subsequent calls, this
     // list will grow to include union expansions.
-    function validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, argParamMatches, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+    function validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, argParamMatches, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a, _b;
         const returnTypes = [];
         const matchedOverloads = [];
@@ -6131,7 +6135,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // record any final types in the type cache.
                 const callResult = useSpeculativeMode(errorNode, () => {
                     return validateFunctionArgumentTypesWithContext(errorNode, matchResults, effectiveTypeVarContext, 
-                    /* skipUnknownArgCheck */ true, inferenceContext);
+                    /* skipUnknownArgCheck */ true, inferenceContext, signatureTracker);
                 });
                 if (callResult.isTypeIncomplete) {
                     isTypeIncomplete = true;
@@ -6240,7 +6244,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const finalTypeVarContext = typeVarContext !== null && typeVarContext !== void 0 ? typeVarContext : matchedOverloads[0].typeVarContext;
         finalTypeVarContext.unlock();
         finalTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeId)(matchedOverloads[0].overload));
-        const finalCallResult = validateFunctionArgumentTypesWithContext(errorNode, matchedOverloads[0].matchResults, finalTypeVarContext, skipUnknownArgCheck, inferenceContext);
+        const finalCallResult = validateFunctionArgumentTypesWithContext(errorNode, matchedOverloads[0].matchResults, finalTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         if (finalCallResult.isTypeIncomplete) {
             isTypeIncomplete = true;
         }
@@ -6306,7 +6310,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // Create a list of potential overload matches based on arguments.
         types_1.OverloadedFunctionType.getOverloads(typeResult.type).forEach((overload) => {
             useSpeculativeMode(errorNode, () => {
-                const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex);
+                const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex, 
+                /* signatureTracker */ undefined);
                 if (!matchResults.argumentErrors) {
                     matches.push(matchResults);
                 }
@@ -6337,7 +6342,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             return a.overloadIndex - b.overloadIndex;
         });
     }
-    function validateOverloadedFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+    function validateOverloadedFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         let filteredMatchResults = [];
         let contextFreeArgTypes;
         let isTypeIncomplete = !!typeResult.isIncomplete;
@@ -6352,7 +6357,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // 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.
-                const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex);
+                const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: overload, isIncomplete: typeResult.isIncomplete }, overloadIndex, signatureTracker);
                 if (!matchResults.argumentErrors) {
                     filteredMatchResults.push(matchResults);
                 }
@@ -6369,7 +6374,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const functionName = typeResult.type.overloads[0].details.name || '<anonymous function>';
                 const diagAddendum = new diagnostic_1.DiagnosticAddendum();
                 const argTypes = argList.map((t) => {
-                    const typeString = printType(getTypeOfArgument(t).type);
+                    const typeString = printType(getTypeOfArgument(t, /* inferenceContext */ undefined, signatureTracker).type);
                     if (t.argumentCategory === 1 /* ArgumentCategory.UnpackedList */) {
                         return `*${typeString}`;
                     }
@@ -6408,7 +6413,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const effectiveTypeVarContext = typeVarContext !== null && typeVarContext !== void 0 ? typeVarContext : new typeVarContext_1.TypeVarContext();
             effectiveTypeVarContext.addSolveForScope((0, typeUtils_1.getTypeVarScopeIds)(bestMatch.overload));
             effectiveTypeVarContext.unlock();
-            return validateFunctionArgumentTypesWithContext(errorNode, bestMatch, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext);
+            return validateFunctionArgumentTypesWithContext(errorNode, bestMatch, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         }
         // If there is only one possible arg/param match among the overloads,
         // use the normal type matching mechanism because it is faster and
@@ -6420,7 +6425,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let expandedArgTypes = [argList.map((arg) => undefined)];
         while (true) {
-            const callResult = validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, filteredMatchResults, typeVarContext, skipUnknownArgCheck, inferenceContext);
+            const callResult = validateOverloadsWithExpandedTypes(errorNode, expandedArgTypes, filteredMatchResults, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
             if (callResult.isTypeIncomplete) {
                 isTypeIncomplete = true;
             }
@@ -6518,7 +6523,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // list, specializes the call based on arg types, and returns the
     // specialized type of the return value. If it detects an error along
     // the way, it emits a diagnostic and sets argumentErrors to true.
-    function validateCallArguments(errorNode, argList, callTypeResult, typeVarContext, skipUnknownArgCheck = false, inferenceContext, recursionCount = 0) {
+    function validateCallArguments(errorNode, argList, callTypeResult, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount = 0) {
         let argumentErrors = false;
         let isTypeIncomplete = false;
         let specializedInitSelfType;
@@ -6537,7 +6542,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let returnType = mapSubtypesExpandTypeVars(callTypeResult.type, { sortSubtypes: true }, (expandedSubtype, unexpandedSubtype, isLastIteration) => {
             return useSpeculativeMode(isLastIteration ? undefined : errorNode, () => {
-                const callResult = validateCallArgumentsForSubtype(errorNode, argList, expandedSubtype, unexpandedSubtype, !!callTypeResult.isIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+                const callResult = validateCallArgumentsForSubtype(errorNode, argList, expandedSubtype, unexpandedSubtype, !!callTypeResult.isIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
                 if (callResult.argumentErrors) {
                     argumentErrors = true;
                 }
@@ -6567,7 +6572,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             overloadsUsedForCall,
         };
     }
-    function validateCallArgumentsForSubtype(errorNode, argList, expandedCallType, unexpandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount) {
+    function validateCallArgumentsForSubtype(errorNode, argList, expandedCallType, unexpandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount) {
         switch (expandedCallType.category) {
             case 3 /* TypeCategory.Never */:
             case 1 /* TypeCategory.Unknown */:
@@ -6578,17 +6583,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (!isCallTypeIncomplete) {
                     argList.forEach((arg) => {
                         if (arg.valueExpression && !isSpeculativeModeInUse(arg.valueExpression)) {
-                            getTypeOfArgument(arg);
+                            getTypeOfArgument(arg, /* inferenceContext */ undefined, signatureTracker);
                         }
                     });
                 }
                 return { returnType: expandedCallType };
             }
             case 4 /* TypeCategory.Function */: {
-                return validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext);
+                return validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
             }
             case 5 /* TypeCategory.OverloadedFunction */: {
-                return validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext);
+                return validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
             }
             case 6 /* TypeCategory.Class */: {
                 if ((0, typeUtils_1.isNoneInstance)(expandedCallType)) {
@@ -6596,16 +6601,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return { argumentErrors: true };
                 }
                 if (types_1.TypeBase.isInstantiable(expandedCallType)) {
-                    return validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext);
+                    return validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker);
                 }
-                return validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+                return validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
             }
             // TypeVars should have been expanded in most cases,
             // but we still need to handle the case of Type[T] where
             // T is a constrained type that contains a union. We also
             // need to handle recursive type aliases.
             case 9 /* TypeCategory.TypeVar */: {
-                return validateCallArguments(errorNode, argList, { type: (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(expandedCallType), isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+                return validateCallArguments(errorNode, argList, { type: (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(expandedCallType), isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
             }
             case 7 /* TypeCategory.Module */: {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.moduleNotCallable(), errorNode);
@@ -6614,7 +6619,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { argumentErrors: true };
     }
-    function validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+    function validateCallForFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a;
         if (types_1.TypeBase.isInstantiable(expandedCallType)) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.callableNotInstantiable().format({
@@ -6634,14 +6639,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const result = {
                 returnType: (0, namedTuples_1.createNamedTupleType)(evaluatorInterface, errorNode, argList, /* includesTypes */ false),
             };
-            validateFunctionArguments(errorNode, argList, { type: expandedCallType }, effectiveTypeVarContext, skipUnknownArgCheck);
+            validateFunctionArguments(errorNode, argList, { type: expandedCallType }, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
             return result;
         }
         // Handle the NewType specially, replacing the normal return type.
         if (expandedCallType.details.builtInName === 'NewType') {
             return { returnType: createNewType(errorNode, argList) };
         }
-        const functionResult = validateFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext);
+        const functionResult = validateFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, effectiveTypeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         let isTypeIncomplete = !!functionResult.isTypeIncomplete;
         let returnType = functionResult.returnType;
         let argumentErrors = !!functionResult.argumentErrors;
@@ -6748,13 +6753,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { symbol, symbolName, classType, hasImplementation };
     }
-    function validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext) {
+    function validateCallForOverloadedFunction(errorNode, argList, expandedCallType, isCallTypeIncomplete, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a, _b;
         // Handle the 'cast' call as a special case.
         if (expandedCallType.overloads[0].details.builtInName === 'cast' && argList.length === 2) {
             return { returnType: evaluateCastCall(argList, errorNode) };
         }
-        const callResult = validateOverloadedFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext);
+        const callResult = validateOverloadedFunctionArguments(errorNode, argList, { type: expandedCallType, isIncomplete: isCallTypeIncomplete }, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker);
         let returnType = (_a = callResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
         let isTypeIncomplete = !!callResult.isTypeIncomplete;
         let argumentErrors = !!callResult.argumentErrors;
@@ -6781,7 +6786,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             specializedInitSelfType: callResult.specializedInitSelfType,
         };
     }
-    function validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext) {
+    function validateCallForInstantiableClass(errorNode, argList, expandedCallType, unexpandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker) {
         var _a, _b;
         if (expandedCallType.literalValue !== undefined) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportCallIssue, localize_1.LocMessage.literalNotCallable(), errorNode);
@@ -6798,11 +6803,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return { returnType: types_1.UnknownType.create(), argumentErrors: true };
                 }
                 // Validate the constructor arguments.
-                (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext);
+                (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker);
                 // The one-parameter form of "type" returns the class
                 // for the specified object.
                 if (expandedCallType.details.name === 'type' && argList.length === 1) {
-                    const argType = getTypeOfArgument(argList[0]).type;
+                    const argType = getTypeOfArgument(argList[0], 
+                    /* inferenceContext */ undefined, signatureTracker).type;
                     const returnType = (0, typeUtils_1.mapSubtypes)(argType, (subtype) => {
                         if ((0, types_1.isInstantiableClass)(subtype) && subtype.details.effectiveMetaclass) {
                             return subtype.details.effectiveMetaclass;
@@ -6864,7 +6870,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (initTypeResult && (0, types_1.isOverloadedFunction)(initTypeResult.type)) {
                     validateOverloadedFunctionArguments(errorNode, argList, { type: initTypeResult.type }, 
                     /* typeVarContext */ undefined, skipUnknownArgCheck, 
-                    /* inferenceContext */ undefined);
+                    /* inferenceContext */ undefined, signatureTracker);
                 }
                 return result;
             }
@@ -6926,7 +6932,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }), errorNode);
         }
         // Assume this is a call to the constructor.
-        const constructorResult = (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext);
+        const constructorResult = (0, constructors_1.validateConstructorArguments)(evaluatorInterface, errorNode, argList, expandedCallType, skipUnknownArgCheck, inferenceContext, signatureTracker);
         const overloadsUsedForCall = constructorResult.overloadsUsedForCall;
         const argumentErrors = constructorResult.argumentErrors;
         const isTypeIncomplete = constructorResult.isTypeIncomplete;
@@ -6945,7 +6951,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             returnType.details.mro.some((baseClass) => (0, types_1.isInstantiableClass)(baseClass) && types_1.ClassType.isBuiltIn(baseClass, 'type'))) {
             let newClassName = '__class_' + returnType.details.name;
             if (argList.length === 3) {
-                const firstArgType = getTypeOfArgument(argList[0]).type;
+                const firstArgType = getTypeOfArgument(argList[0], 
+                /* inferenceContext */ undefined, signatureTracker).type;
                 if ((0, types_1.isClassInstance)(firstArgType) &&
                     types_1.ClassType.isBuiltIn(firstArgType, 'str') &&
                     typeof firstArgType.literalValue === 'string') {
@@ -6961,7 +6968,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { returnType, overloadsUsedForCall, argumentErrors, isTypeIncomplete };
     }
-    function validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount) {
+    function validateCallForClassInstance(errorNode, argList, expandedCallType, unexpandedCallType, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount) {
         var _a;
         const callDiag = new diagnostic_1.DiagnosticAddendum();
         const callMethodResult = getTypeOfBoundMember(errorNode, expandedCallType, '__call__', 
@@ -6974,7 +6981,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }) + callDiag.getString(), errorNode);
             return { returnType: types_1.UnknownType.create(), argumentErrors: true };
         }
-        const callResult = validateCallArguments(errorNode, argList, { type: callMethodType }, typeVarContext, skipUnknownArgCheck, inferenceContext, recursionCount);
+        const callResult = validateCallArguments(errorNode, argList, { type: callMethodType }, typeVarContext, skipUnknownArgCheck, inferenceContext, signatureTracker, recursionCount);
         let returnType = (_a = callResult.returnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
         if ((0, types_1.isTypeVar)(unexpandedCallType) &&
             types_1.TypeBase.isInstantiable(unexpandedCallType) &&
@@ -6994,7 +7001,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function evaluateCastCall(argList, errorNode) {
         // Verify that the cast is necessary.
         const castToType = getTypeOfArgumentExpectingType(argList[0], { enforceTypeAnnotationRules: true }).type;
-        let castFromType = getTypeOfArgument(argList[1]).type;
+        let castFromType = getTypeOfArgument(argList[1], 
+        /* inferenceContext */ undefined, 
+        /* signatureTracker */ undefined).type;
         if (castFromType.specialForm) {
             castFromType = castFromType.specialForm;
         }
@@ -7010,16 +7019,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return (0, typeUtils_1.convertToInstance)(castToType);
     }
     // Expands any unpacked tuples within an argument list.
-    function expandArgList(argList) {
+    function expandArgList(argList, signatureTracker) {
         var _a;
         const expandedArgList = [];
         for (const arg of argList) {
             if (arg.argumentCategory === 1 /* ArgumentCategory.UnpackedList */) {
-                const argType = getTypeOfArgument(arg).type;
+                const argType = getTypeOfArgument(arg, /* inferenceContext */ undefined, signatureTracker).type;
                 // If this is a tuple with specified element types, use those
                 // specified types rather than using the more generic iterator
                 // type which will be a union of all element types.
-                const combinedArgType = (0, typeUtils_1.combineSameSizedTuples)(makeTopLevelTypeVarsConcrete(argType), tupleClassType);
+                const combinedArgType = (0, typeUtils_1.combineSameSizedTuples)(makeTopLevelTypeVarsConcrete(argType), tupleClass);
                 if ((0, types_1.isClassInstance)(combinedArgType) && (0, typeUtils_1.isTupleClass)(combinedArgType)) {
                     const tupleTypeArgs = (_a = combinedArgType.tupleTypeArguments) !== null && _a !== void 0 ? _a : [];
                     if (tupleTypeArgs.length !== 1 || !tupleTypeArgs[0].isUnbounded) {
@@ -7057,7 +7066,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // function. This matching is done based on positions and keywords. Type evaluation and
     // validation is left to the caller.
     // This logic is based on PEP 3102: https://www.python.org/dev/peps/pep-3102/
-    function matchFunctionArgumentsToParameters(errorNode, argList, typeResult, overloadIndex) {
+    function matchFunctionArgumentsToParameters(errorNode, argList, typeResult, overloadIndex, signatureTracker) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const paramDetails = (0, parameterUtils_1.getParameterListDetails)(typeResult.type);
         let argIndex = 0;
@@ -7066,7 +7075,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let isTypeIncomplete = !!typeResult.isIncomplete;
         let isVariadicTypeVarFullyMatched = false;
         // Expand any unpacked tuples in the arg list.
-        argList = expandArgList(argList);
+        argList = expandArgList(argList, signatureTracker);
         // Build a map of parameters by name.
         const paramMap = new Map();
         paramDetails.params.forEach((paramInfo) => {
@@ -7076,7 +7085,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 paramMap.set(param.name, {
                     argsNeeded: param.category === 0 /* ParameterCategory.Simple */ && !param.hasDefault ? 1 : 0,
                     argsReceived: 0,
-                    isPositionalOnly: paramInfo.source === parameterUtils_1.ParameterSource.PositionOnly,
+                    isPositionalOnly: paramInfo.kind === parameterUtils_1.ParameterKind.Positional,
                 });
             }
         });
@@ -7190,7 +7199,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         // If this is an unpacked iterable, we will conservatively assume that it
                         // might have zero iterations unless we can tell from its type that it
                         // definitely has at least one iterable value.
-                        const argType = getTypeOfArgument(argList[argIndex]).type;
+                        const argType = getTypeOfArgument(argList[argIndex], 
+                        /* inferenceContext */ undefined, signatureTracker).type;
                         if ((0, types_1.isClassInstance)(argType) &&
                             (0, typeUtils_1.isTupleClass)(argType) &&
                             !(0, typeUtils_1.isUnboundedTupleClass)(argType) &&
@@ -7225,7 +7235,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 (0, types_1.isVariadicTypeVar)(paramType);
             if (argList[argIndex].argumentCategory === 1 /* ArgumentCategory.UnpackedList */) {
                 let isArgCompatibleWithVariadic = false;
-                const argTypeResult = getTypeOfArgument(argList[argIndex]);
+                const argTypeResult = getTypeOfArgument(argList[argIndex], 
+                /* inferenceContext */ undefined, signatureTracker);
                 let listElementType;
                 let advanceToNextArg = false;
                 // Handle the case where *args is being passed to a function defined
@@ -7460,7 +7471,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             while (argIndex < argList.length) {
                 if (argList[argIndex].argumentCategory === 2 /* ArgumentCategory.UnpackedDictionary */) {
                     // Verify that the type used in this expression is a SupportsKeysAndGetItem[str, T].
-                    const argType = getTypeOfArgument(argList[argIndex], (0, typeUtils_1.makeInferenceContext)(paramDetails.unpackedKwargsTypedDictType)).type;
+                    const argType = getTypeOfArgument(argList[argIndex], (0, typeUtils_1.makeInferenceContext)(paramDetails.unpackedKwargsTypedDictType), signatureTracker).type;
                     if ((0, types_1.isAnyOrUnknown)(argType)) {
                         unpackedDictionaryArgType = argType;
                     }
@@ -7546,20 +7557,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                     else {
                         const strObjType = getBuiltInObject(errorNode, 'str');
-                        if (supportsKeysAndGetItemProtocolType &&
-                            (0, types_1.isInstantiableClass)(supportsKeysAndGetItemProtocolType) &&
+                        if (supportsKeysAndGetItemClass &&
+                            (0, types_1.isInstantiableClass)(supportsKeysAndGetItemClass) &&
                             strObjType &&
                             (0, types_1.isClassInstance)(strObjType)) {
-                            const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(supportsKeysAndGetItemProtocolType));
+                            const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(supportsKeysAndGetItemClass));
                             let isValidMappingType = false;
                             // If this was a TypeVar (e.g. for pseudo-generic classes),
                             // don't emit this error.
                             if ((0, types_1.isTypeVar)(argType)) {
                                 isValidMappingType = true;
                             }
-                            else if (assignType(types_1.ClassType.cloneAsInstance(supportsKeysAndGetItemProtocolType), argType, 
+                            else if (assignType(types_1.ClassType.cloneAsInstance(supportsKeysAndGetItemClass), argType, 
                             /* diag */ undefined, mappingTypeVarContext)) {
-                                const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(supportsKeysAndGetItemProtocolType, mappingTypeVarContext);
+                                const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(supportsKeysAndGetItemClass, mappingTypeVarContext);
                                 const typeArgs = specializedMapping.typeArguments;
                                 if (typeArgs && typeArgs.length >= 2) {
                                     if (assignType(strObjType, typeArgs[0])) {
@@ -7675,7 +7686,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         // Handle the case where a *args: P.args (or *args: Any) is passed as an
                         // argument to a function that accepts a ParamSpec.
                         if (typeResult.type.details.paramSpec) {
-                            const argTypeResult = getTypeOfArgument(argList[argIndex]);
+                            const argTypeResult = getTypeOfArgument(argList[argIndex], 
+                            /* inferenceContext */ undefined, signatureTracker);
                             const argType = argTypeResult.type;
                             if (argTypeResult.isIncomplete) {
                                 isTypeIncomplete = true;
@@ -7798,7 +7810,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if ((0, types_1.isVariadicTypeVar)(paramType) && !paramType.isVariadicInUnion) {
                     const tupleTypeArgs = variadicArgs.map((argParam) => {
                         var _a;
-                        const argType = getTypeOfArgument(argParam.argument).type;
+                        const argType = getTypeOfArgument(argParam.argument, 
+                        /* inferenceContext */ undefined, signatureTracker).type;
                         const containsVariadicTypeVar = (0, types_1.isUnpackedVariadicTypeVar)(argType) ||
                             ((0, types_1.isClassInstance)(argType) &&
                                 (0, typeUtils_1.isTupleClass)(argType) &&
@@ -7878,10 +7891,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // After having matched arguments with parameters, this function evaluates the
     // types of each argument expression and validates that the resulting type is
     // compatible with the declared type of the corresponding parameter.
-    function validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck = false, inferenceContext) {
-        var _a, _b;
+    function validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck = false, inferenceContext, signatureTracker) {
+        var _a;
         const type = matchResults.overload;
-        const signatureTracker = (_a = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) !== null && _a !== void 0 ? _a : new typeUtils_1.UniqueSignatureTracker();
+        if (!signatureTracker) {
+            signatureTracker = new typeUtils_1.UniqueSignatureTracker();
+        }
         matchResults.overload = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(matchResults.overload, signatureTracker, errorNode.start);
         // Can we safely ignore the inference context (either because it's not provided
         // or will have no effect)? If so, we can eliminate a bunch of extra work.
@@ -7889,7 +7904,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             (0, types_1.isAnyOrUnknown)(inferenceContext.expectedType) ||
             (0, types_1.isNever)(inferenceContext.expectedType) ||
             !type.details.declaredReturnType ||
-            !(0, typeUtils_1.requiresSpecialization)((_b = types_1.FunctionType.getSpecializedReturnType(type)) !== null && _b !== void 0 ? _b : types_1.UnknownType.create())) {
+            !(0, typeUtils_1.requiresSpecialization)((_a = types_1.FunctionType.getSpecializedReturnType(type)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create())) {
             return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck);
         }
         const effectiveReturnType = getFunctionEffectiveReturnType(type);
@@ -7972,7 +7987,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck);
     }
-    function validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck = false) {
+    function validateFunctionArgumentTypes(errorNode, matchResults, typeVarContext, signatureTracker, skipUnknownArgCheck) {
         const type = matchResults.overload;
         let isTypeIncomplete = matchResults.isTypeIncomplete;
         let argumentErrors = false;
@@ -8202,7 +8217,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             types_1.ClassType.isBuiltIn(specializedReturnType, ['TypeGuard', 'TypeIs']) &&
             specializedReturnType.typeArguments &&
             specializedReturnType.typeArguments.length > 0) {
-            if (boolClassType && (0, types_1.isInstantiableClass)(boolClassType)) {
+            if (boolClass && (0, types_1.isInstantiableClass)(boolClass)) {
                 let typeGuardType = specializedReturnType.typeArguments[0];
                 // If the first argument is a simple (non-constrained) TypeVar,
                 // associate that TypeVar with the resulting TypeGuard type.
@@ -8217,7 +8232,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                 }
                 const useTypeIsSemantics = types_1.ClassType.isBuiltIn(specializedReturnType, 'TypeIs');
-                specializedReturnType = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForTypeGuard(boolClassType, typeGuardType, useTypeIsSemantics));
+                specializedReturnType = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForTypeGuard(boolClass, typeGuardType, useTypeIsSemantics));
             }
         }
         const liveTypeVarScopes = ParseTreeUtils.getTypeVarScopesForNode(errorNode);
@@ -8289,11 +8304,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // Tries to assign the call arguments to the function parameter
     // list and reports any mismatches in types or counts. Returns the
     // specialized return type of the call.
-    function validateFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck = false, inferenceContext) {
-        var _a;
-        const signatureTracker = (_a = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.signatureTracker) !== null && _a !== void 0 ? _a : new typeUtils_1.UniqueSignatureTracker();
+    function validateFunctionArguments(errorNode, argList, typeResult, typeVarContext, skipUnknownArgCheck = false, inferenceContext, signatureTracker) {
+        if (!signatureTracker) {
+            signatureTracker = new typeUtils_1.UniqueSignatureTracker();
+        }
         typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, signatureTracker, errorNode.start);
-        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, typeResult, 0);
+        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, typeResult, 0, signatureTracker);
         if (matchResults.argumentErrors) {
             // Evaluate types of all args. This will ensure that referenced symbols are
             // not reported as unaccessed.
@@ -8308,7 +8324,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 overloadsUsedForCall: [],
             };
         }
-        return validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck, (0, typeUtils_1.makeInferenceContext)(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType, inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete, signatureTracker));
+        return validateFunctionArgumentTypesWithContext(errorNode, matchResults, typeVarContext, skipUnknownArgCheck, (0, typeUtils_1.makeInferenceContext)(inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType, inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.isTypeIncomplete), signatureTracker);
     }
     // Determines whether the specified argument list satisfies the function
     // signature bound to the specified ParamSpec. Return value indicates success.
@@ -8344,7 +8360,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (!paramSpecType) {
             paramSpecType = (0, typeUtils_1.convertTypeToParamSpecValue)(paramSpec);
         }
-        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: paramSpecType }, 0);
+        const matchResults = matchFunctionArgumentsToParameters(errorNode, argList, { type: paramSpecType }, 0, signatureTracker);
         const functionType = matchResults.overload;
         const srcTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeIds)(paramSpecType));
         if (matchResults.argumentErrors) {
@@ -8369,7 +8385,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             let argumentErrors = false;
             let argErrorNode;
             for (const arg of argList) {
-                const argType = (_a = getTypeOfArgument(arg)) === null || _a === void 0 ? void 0 : _a.type;
+                const argType = (_a = getTypeOfArgument(arg, /* inferenceContext */ undefined, signatureTracker)) === null || _a === void 0 ? void 0 : _a.type;
                 const isArgTypeCompatible = argType && ((0, types_1.isTypeSame)(argType, paramSpec, { ignoreTypeFlags: true }) || (0, types_1.isAnyOrUnknown)(argType));
                 if (arg.argumentCategory === 1 /* ArgumentCategory.UnpackedList */ && !sawArgs && isArgTypeCompatible) {
                     sawArgs = true;
@@ -8394,7 +8410,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             return { argumentErrors, typeVarContexts: [srcTypeVarContext] };
         }
-        const result = validateFunctionArgumentTypes(errorNode, matchResults, srcTypeVarContext, signatureTracker);
+        const result = validateFunctionArgumentTypes(errorNode, matchResults, srcTypeVarContext, signatureTracker, 
+        /* skipUnknownArgCheck */ undefined);
         return { argumentErrors: !!result.argumentErrors, typeVarContexts: [srcTypeVarContext] };
     }
     function validateArgType(argParam, typeVarContext, signatureTracker, typeResult, options) {
@@ -8457,7 +8474,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         16 /* EvaluatorFlags.DisallowFinal */ |
                         2 /* EvaluatorFlags.DoNotSpecialize */
                     : 2 /* EvaluatorFlags.DoNotSpecialize */ | 16 /* EvaluatorFlags.DisallowFinal */;
-                const exprTypeResult = getTypeOfExpression(argParam.argument.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedType, !!(typeResult === null || typeResult === void 0 ? void 0 : typeResult.isIncomplete), signatureTracker));
+                const exprTypeResult = getTypeOfExpression(argParam.argument.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedType, !!(typeResult === null || typeResult === void 0 ? void 0 : typeResult.isIncomplete)), signatureTracker);
                 argType = exprTypeResult.type;
                 // If the type includes multiple instances of a generic function
                 // signature, force the type arguments for the duplicates to have
@@ -8492,7 +8509,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 argType = argParam.argType;
             }
             else {
-                const argTypeResult = getTypeOfArgument(argParam.argument);
+                const argTypeResult = getTypeOfArgument(argParam.argument, 
+                /* inferenceContext */ undefined, signatureTracker);
                 argType = argTypeResult.type;
                 if (argTypeResult.isIncomplete) {
                     isTypeIncomplete = true;
@@ -8937,12 +8955,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     function getParamSpecDefaultType(node, isPep695Syntax) {
         const functionType = types_1.FunctionType.createSynthesizedInstance('', 65536 /* FunctionTypeFlags.ParamSpecValue */);
-        if (node.nodeType === 18 /* ParseNodeType.Ellipsis */) {
+        if (node.nodeType === 21 /* ParseNodeType.Ellipsis */) {
             types_1.FunctionType.addDefaultParameters(functionType);
             functionType.details.flags |= 32768 /* FunctionTypeFlags.SkipArgsKwargsCompatibilityCheck */;
             return functionType;
         }
-        if (node.nodeType === 31 /* ParseNodeType.List */) {
+        if (node.nodeType === 34 /* ParseNodeType.List */) {
             node.entries.forEach((paramExpr, index) => {
                 const typeResult = getTypeOfExpressionExpectingType(paramExpr, {
                     allowTypeVarsWithoutScopeId: true,
@@ -9072,7 +9090,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         /* typeParamNodes */ undefined, () => typeParameters);
     }
     function getBooleanValue(node) {
-        if (node.nodeType === 11 /* ParseNodeType.Constant */) {
+        if (node.nodeType === 14 /* ParseNodeType.Constant */) {
             if (node.constType === 15 /* KeywordType.False */) {
                 return false;
             }
@@ -9126,9 +9144,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let baseClass = getTypeOfArgumentExpectingType(argList[1]).type;
         let isBaseClassAny = false;
         if ((0, types_1.isAnyOrUnknown)(baseClass)) {
-            if (objectType && (0, types_1.isClassInstance)(objectType)) {
-                baseClass = types_1.ClassType.cloneAsInstantiable(objectType);
-            }
+            baseClass = objectClass !== null && objectClass !== void 0 ? objectClass : types_1.UnknownType.create();
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.newTypeAnyOrUnknown(), (_c = argList[1].node) !== null && _c !== void 0 ? _c : errorNode);
             isBaseClassAny = true;
         }
@@ -9190,12 +9206,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // Implements the semantics of the multi-parameter variant of the "type" call.
     function createClassFromMetaclass(errorNode, argList, metaclass) {
         const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
-        const arg0Type = getTypeOfArgument(argList[0]).type;
+        const arg0Type = getTypeOfArgument(argList[0], 
+        /* inferenceContext */ undefined, 
+        /* signatureTracker */ undefined).type;
         if (!(0, types_1.isClassInstance)(arg0Type) || !types_1.ClassType.isBuiltIn(arg0Type, 'str')) {
             return undefined;
         }
         const className = arg0Type.literalValue || '_';
-        const arg1Type = getTypeOfArgument(argList[1]).type;
+        const arg1Type = getTypeOfArgument(argList[1], 
+        /* inferenceContext */ undefined, 
+        /* signatureTracker */ undefined).type;
         // TODO - properly handle case where tuple of base classes is provided.
         if (!(0, types_1.isClassInstance)(arg1Type) || !(0, typeUtils_1.isTupleClass)(arg1Type) || arg1Type.tupleTypeArguments === undefined) {
             return undefined;
@@ -9207,7 +9227,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 classType.details.baseClasses.push(specializedType);
             }
             else {
-                addExpectedClassDiagnostic(typeArg.type, argList[1].valueExpression || errorNode);
+                classType.details.baseClasses.push(types_1.UnknownType.create());
             }
         });
         if (!(0, typeUtils_1.computeMroLinearization)(classType)) {
@@ -9218,7 +9238,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function getTypeOfConstant(node, flags) {
         let type;
         if (node.constType === 26 /* KeywordType.None */) {
-            type = (flags & 128 /* EvaluatorFlags.ExpectingInstantiableType */) !== 0 ? noneClassType : noneType;
+            if (noneTypeClass) {
+                type =
+                    (flags & 128 /* EvaluatorFlags.ExpectingInstantiableType */) !== 0
+                        ? noneTypeClass
+                        : (0, typeUtils_1.convertToInstance)(noneTypeClass);
+            }
         }
         else if (node.constType === 33 /* KeywordType.True */ ||
             node.constType === 15 /* KeywordType.False */ ||
@@ -9258,7 +9283,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     (0, debug_1.assert)(magicMethodType !== undefined);
                     return validateCallArguments(errorNode, functionArgs, { type: magicMethodType }, 
                     /* typeVarContext */ undefined, 
-                    /* skipUnknownArgCheck */ true, inferenceContext);
+                    /* skipUnknownArgCheck */ true, inferenceContext, 
+                    /* signatureTracker */ undefined);
                 });
                 // If there were errors with the expected type, try
                 // to evaluate without the expected type.
@@ -9267,7 +9293,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         (0, debug_1.assert)(magicMethodType !== undefined);
                         return validateCallArguments(errorNode, functionArgs, { type: magicMethodType }, 
                         /* typeVarContext */ undefined, 
-                        /* skipUnknownArgCheck */ true);
+                        /* skipUnknownArgCheck */ true, 
+                        /* inferenceContext */ undefined, 
+                        /* signatureTracker */ undefined);
                     });
                 }
                 if (callResult.argumentErrors) {
@@ -9286,15 +9314,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 return handleSubtype(subtype);
             }
             if ((0, typeUtils_1.isNoneInstance)(subtype)) {
-                if (objectType && (0, types_1.isClassInstance)(objectType)) {
+                if (objectClass && (0, types_1.isInstantiableClass)(objectClass)) {
                     // Use 'object' for 'None'.
-                    return handleSubtype(objectType);
+                    return handleSubtype((0, typeUtils_1.convertToInstance)(objectClass));
                 }
             }
             if ((0, typeUtils_1.isNoneTypeClass)(subtype)) {
-                if (typeClassType && (0, types_1.isInstantiableClass)(typeClassType)) {
+                if (typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
                     // Use 'type' for 'type[None]'.
-                    return handleSubtype(types_1.ClassType.cloneAsInstance(typeClassType));
+                    return handleSubtype(types_1.ClassType.cloneAsInstance(typeClass));
                 }
             }
             magicMethodSupported = false;
@@ -9325,7 +9353,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return;
                 }
                 const subtypeResult = useSpeculativeMode(node, () => {
-                    return getTypeOfDictionaryWithContext(node, (0, typeUtils_1.makeInferenceContext)(subtype));
+                    return getTypeOfDictionaryWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(subtype));
                 });
                 if (subtypeResult && assignType(subtype, subtypeResult.type)) {
                     // If this is the first result we're seeing or it's the first result
@@ -9342,15 +9370,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let expectedTypeDiagAddendum = undefined;
         if (effectiveExpectedType) {
             expectedTypeDiagAddendum = new diagnostic_1.DiagnosticAddendum();
-            const result = getTypeOfDictionaryWithContext(node, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType), expectedTypeDiagAddendum);
+            const result = getTypeOfDictionaryWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType), expectedTypeDiagAddendum);
             if (result) {
                 return result;
             }
         }
-        const result = getTypeOfDictionaryInferred(node, /* hasExpectedType */ !!inferenceContext);
+        const result = getTypeOfDictionaryInferred(node, flags, /* hasExpectedType */ !!inferenceContext);
         return { ...result, expectedTypeDiagAddendum };
     }
-    function getTypeOfDictionaryWithContext(node, inferenceContext, expectedDiagAddendum) {
+    function getTypeOfDictionaryWithContext(node, flags, inferenceContext, expectedDiagAddendum) {
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         let concreteExpectedType = makeTopLevelTypeVarsConcrete(inferenceContext.expectedType);
         if (!(0, types_1.isClassInstance)(concreteExpectedType)) {
@@ -9367,7 +9395,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             concreteExpectedType = types_1.TypeBase.cloneForCondition(concreteExpectedType, undefined);
             const expectedTypedDictEntries = (0, typedDicts_1.getTypedDictMembersForClass)(evaluatorInterface, concreteExpectedType);
             // Infer the key and value types if possible.
-            const keyValueTypeResult = getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, 
+            const keyValueTypeResult = getKeyAndValueTypesFromDictionary(node, flags, keyTypes, valueTypes, 
             /* forceStrictInference */ true, 
             /* isValueTypeInvariant */ true, 
             /* expectedKeyType */ undefined, 
@@ -9425,7 +9453,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
         // Infer the key and value types if possible.
-        const keyValueResult = getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, 
+        const keyValueResult = getKeyAndValueTypesFromDictionary(node, flags, keyTypes, valueTypes, 
         /* forceStrictInference */ true, isValueTypeInvariant, expectedKeyType, expectedValueType, undefined, expectedDiagAddendum);
         if (keyValueResult.isIncomplete) {
             isIncomplete = true;
@@ -9444,7 +9472,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     // Attempts to infer the type of a dictionary statement. If hasExpectedType
     // is true, strict inference is used for the subexpressions.
-    function getTypeOfDictionaryInferred(node, hasExpectedType) {
+    function getTypeOfDictionaryInferred(node, flags, hasExpectedType) {
         const fallbackType = hasExpectedType ? types_1.AnyType.create() : types_1.UnknownType.create();
         let keyType = fallbackType;
         let valueType = fallbackType;
@@ -9454,7 +9482,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let isIncomplete = false;
         let typeErrors = false;
         // Infer the key and value types if possible.
-        const keyValueResult = getKeyAndValueTypesFromDictionary(node, keyTypeResults, valueTypeResults, 
+        const keyValueResult = getKeyAndValueTypesFromDictionary(node, flags, keyTypeResults, valueTypeResults, 
         /* forceStrictInference */ hasExpectedType, 
         /* isValueTypeInvariant */ false);
         if (keyValueResult.isIncomplete) {
@@ -9498,16 +9526,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type, isIncomplete, typeErrors };
     }
-    function getKeyAndValueTypesFromDictionary(node, keyTypes, valueTypes, forceStrictInference, isValueTypeInvariant, expectedKeyType, expectedValueType, expectedTypedDictEntries, expectedDiagAddendum) {
+    function getKeyAndValueTypesFromDictionary(node, flags, keyTypes, valueTypes, forceStrictInference, isValueTypeInvariant, expectedKeyType, expectedValueType, expectedTypedDictEntries, expectedDiagAddendum) {
         let isIncomplete = false;
         let typeErrors = false;
+        // Mask out some of the flags that are not applicable for a dictionary key
+        // even if it appears within an inlined TypedDict annotation.
+        const keyFlags = flags &
+            ~(256 /* EvaluatorFlags.ExpectingTypeAnnotation */ |
+                8 /* EvaluatorFlags.EvaluateStringLiteralAsType */ |
+                128 /* EvaluatorFlags.ExpectingInstantiableType */);
         // Infer the key and value types if possible.
         node.entries.forEach((entryNode, index) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             let addUnknown = true;
-            if (entryNode.nodeType === 17 /* ParseNodeType.DictionaryKeyEntry */) {
-                const keyTypeResult = getTypeOfExpression(entryNode.keyExpression, 
-                /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedKeyType !== null && expectedKeyType !== void 0 ? expectedKeyType : (forceStrictInference ? types_1.NeverType.createNever() : undefined)));
+            if (entryNode.nodeType === 20 /* ParseNodeType.DictionaryKeyEntry */) {
+                const keyTypeResult = getTypeOfExpression(entryNode.keyExpression, keyFlags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(expectedKeyType !== null && expectedKeyType !== void 0 ? expectedKeyType : (forceStrictInference ? types_1.NeverType.createNever() : undefined)));
                 if (keyTypeResult.isIncomplete) {
                     isIncomplete = true;
                 }
@@ -9530,14 +9563,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     expectedTypedDictEntries.knownItems.has(keyType.literalValue)) {
                     const effectiveValueType = expectedTypedDictEntries.knownItems.get(keyType.literalValue).valueType;
                     entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(effectiveValueType);
-                    valueTypeResult = getTypeOfExpression(entryNode.valueExpression, 
-                    /* flags */ undefined, entryInferenceContext);
+                    valueTypeResult = getTypeOfExpression(entryNode.valueExpression, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, entryInferenceContext);
                 }
                 else {
                     const effectiveValueType = expectedValueType !== null && expectedValueType !== void 0 ? expectedValueType : (forceStrictInference ? types_1.NeverType.createNever() : undefined);
                     entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(effectiveValueType);
-                    valueTypeResult = getTypeOfExpression(entryNode.valueExpression, 
-                    /* flags */ undefined, entryInferenceContext);
+                    valueTypeResult = getTypeOfExpression(entryNode.valueExpression, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, entryInferenceContext);
                 }
                 if (entryInferenceContext && !valueTypeResult.typeErrors) {
                     const fromExpectedType = inferTypeArgFromExpectedEntryType(entryInferenceContext, [valueTypeResult.type], !isValueTypeInvariant);
@@ -9570,17 +9601,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 addUnknown = false;
             }
-            else if (entryNode.nodeType === 16 /* ParseNodeType.DictionaryExpandEntry */) {
+            else if (entryNode.nodeType === 19 /* ParseNodeType.DictionaryExpandEntry */) {
                 let expectedType;
                 if (expectedKeyType && expectedValueType) {
-                    if (supportsKeysAndGetItemProtocolType && (0, types_1.isInstantiableClass)(supportsKeysAndGetItemProtocolType)) {
-                        expectedType = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(supportsKeysAndGetItemProtocolType, [expectedKeyType, expectedValueType], 
+                    if (supportsKeysAndGetItemClass && (0, types_1.isInstantiableClass)(supportsKeysAndGetItemClass)) {
+                        expectedType = types_1.ClassType.cloneAsInstance(types_1.ClassType.cloneForSpecialization(supportsKeysAndGetItemClass, [expectedKeyType, expectedValueType], 
                         /* isTypeArgumentExplicit */ true));
                     }
                 }
                 const entryInferenceContext = (0, typeUtils_1.makeInferenceContext)(expectedType);
-                let unexpandedTypeResult = getTypeOfExpression(entryNode.expandExpression, 
-                /* flags */ undefined, entryInferenceContext);
+                let unexpandedTypeResult = getTypeOfExpression(entryNode.expandExpression, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, entryInferenceContext);
                 if (entryInferenceContext && !unexpandedTypeResult.typeErrors) {
                     const fromExpectedType = inferTypeArgFromExpectedEntryType(entryInferenceContext, [unexpandedTypeResult.type], !isValueTypeInvariant);
                     if (fromExpectedType) {
@@ -9599,8 +9629,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 else if ((0, types_1.isClassInstance)(unexpandedType) && types_1.ClassType.isTypedDictClass(unexpandedType)) {
                     // Handle dictionary expansion for a TypedDict.
-                    if (strClassType && (0, types_1.isInstantiableClass)(strClassType)) {
-                        const strObject = types_1.ClassType.cloneAsInstance(strClassType);
+                    if (strClass && (0, types_1.isInstantiableClass)(strClass)) {
+                        const strObject = types_1.ClassType.cloneAsInstance(strClass);
                         const tdEntries = (0, typedDicts_1.getTypedDictMembersForClass)(evaluatorInterface, unexpandedType, 
                         /* allowNarrowed */ true);
                         tdEntries.knownItems.forEach((entry, name) => {
@@ -9616,20 +9646,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             keyTypes.push({ node: entryNode, type: types_1.ClassType.cloneAsInstance(strObject) });
                             valueTypes.push({
                                 node: entryNode,
-                                type: (_c = (_b = (_a = tdEntries.extraItems) === null || _a === void 0 ? void 0 : _a.valueType) !== null && _b !== void 0 ? _b : objectType) !== null && _c !== void 0 ? _c : types_1.UnknownType.create(),
+                                type: (_b = (_a = tdEntries.extraItems) === null || _a === void 0 ? void 0 : _a.valueType) !== null && _b !== void 0 ? _b : getObjectType(),
                             });
                         }
                         addUnknown = false;
                     }
                 }
-                else if (supportsKeysAndGetItemProtocolType &&
-                    (0, types_1.isInstantiableClass)(supportsKeysAndGetItemProtocolType)) {
-                    const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(supportsKeysAndGetItemProtocolType));
-                    supportsKeysAndGetItemProtocolType = (0, typeUtils_1.selfSpecializeClass)(supportsKeysAndGetItemProtocolType);
-                    if (assignType(types_1.ClassType.cloneAsInstance(supportsKeysAndGetItemProtocolType), unexpandedType, 
+                else if (supportsKeysAndGetItemClass && (0, types_1.isInstantiableClass)(supportsKeysAndGetItemClass)) {
+                    const mappingTypeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(supportsKeysAndGetItemClass));
+                    supportsKeysAndGetItemClass = (0, typeUtils_1.selfSpecializeClass)(supportsKeysAndGetItemClass);
+                    if (assignType(types_1.ClassType.cloneAsInstance(supportsKeysAndGetItemClass), unexpandedType, 
                     /* diag */ undefined, mappingTypeVarContext, 
                     /* srcTypeVarContext */ undefined, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */)) {
-                        const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(supportsKeysAndGetItemProtocolType, mappingTypeVarContext);
+                        const specializedMapping = (0, typeUtils_1.applySolvedTypeVars)(supportsKeysAndGetItemClass, mappingTypeVarContext);
                         const typeArgs = specializedMapping.typeArguments;
                         if (typeArgs && typeArgs.length >= 2) {
                             if (forceStrictInference || index < maxEntriesToUseForInference) {
@@ -9644,8 +9673,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                 }
             }
-            else if (entryNode.nodeType === 32 /* ParseNodeType.ListComprehension */) {
-                const dictEntryTypeResult = getElementTypeFromListComprehension(entryNode, expectedValueType, expectedKeyType);
+            else if (entryNode.nodeType === 11 /* ParseNodeType.Comprehension */) {
+                const dictEntryTypeResult = getElementTypeFromComprehension(entryNode, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, expectedValueType, expectedKeyType);
                 const dictEntryType = dictEntryTypeResult.type;
                 if (dictEntryTypeResult.isIncomplete) {
                     isIncomplete = true;
@@ -9655,7 +9684,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 // The result should be a tuple.
                 if ((0, types_1.isClassInstance)(dictEntryType) && (0, typeUtils_1.isTupleClass)(dictEntryType)) {
-                    const typeArgs = (_d = dictEntryType.tupleTypeArguments) === null || _d === void 0 ? void 0 : _d.map((t) => t.type);
+                    const typeArgs = (_c = dictEntryType.tupleTypeArguments) === null || _c === void 0 ? void 0 : _c.map((t) => t.type);
                     if (typeArgs && typeArgs.length === 2) {
                         if (forceStrictInference || index < maxEntriesToUseForInference) {
                             keyTypes.push({ node: entryNode, type: typeArgs[0] });
@@ -9677,12 +9706,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function getTypeOfListOrSet(node, flags, inferenceContext) {
         var _a;
         if ((flags & 256 /* EvaluatorFlags.ExpectingTypeAnnotation */) !== 0 &&
-            node.nodeType === 31 /* ParseNodeType.List */ &&
+            node.nodeType === 34 /* ParseNodeType.List */ &&
             ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) !== 1 /* ParseNodeType.Argument */) {
             const diag = new diagnostic_1.DiagnosticAddendum();
             diag.addMessage(localize_1.LocAddendum.useListInstead());
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeForm, localize_1.LocMessage.listInAnnotation() + diag.getString(), node);
         }
+        flags &= ~(256 /* EvaluatorFlags.ExpectingTypeAnnotation */ |
+            8 /* EvaluatorFlags.EvaluateStringLiteralAsType */ |
+            128 /* EvaluatorFlags.ExpectingInstantiableType */);
         // If the expected type is a union, recursively call for each of the subtypes
         // to find one that matches.
         let effectiveExpectedType = inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.expectedType;
@@ -9695,7 +9727,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return;
                 }
                 const subtypeResult = useSpeculativeMode(node, () => {
-                    return getTypeOfListOrSetWithContext(node, (0, typeUtils_1.makeInferenceContext)(subtype));
+                    return getTypeOfListOrSetWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(subtype));
                 });
                 if (subtypeResult && assignType(subtype, subtypeResult.type)) {
                     // If this is the first result we're seeing or it's the first result
@@ -9711,19 +9743,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let expectedTypeDiagAddendum;
         if (effectiveExpectedType) {
-            const result = getTypeOfListOrSetWithContext(node, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType));
+            const result = getTypeOfListOrSetWithContext(node, flags, (0, typeUtils_1.makeInferenceContext)(effectiveExpectedType));
             if (result && !result.typeErrors) {
                 return result;
             }
             expectedTypeDiagAddendum = result === null || result === void 0 ? void 0 : result.expectedTypeDiagAddendum;
         }
-        const typeResult = getTypeOfListOrSetInferred(node, /* hasExpectedType */ inferenceContext !== undefined);
+        const typeResult = getTypeOfListOrSetInferred(node, flags, 
+        /* hasExpectedType */ inferenceContext !== undefined);
         return { ...typeResult, expectedTypeDiagAddendum };
     }
     // Attempts to determine the type of a list or set statement based on an expected type.
     // Returns undefined if that type cannot be honored.
-    function getTypeOfListOrSetWithContext(node, inferenceContext) {
-        const builtInClassName = node.nodeType === 31 /* ParseNodeType.List */ ? 'list' : 'set';
+    function getTypeOfListOrSetWithContext(node, flags, inferenceContext) {
+        const builtInClassName = node.nodeType === 34 /* ParseNodeType.List */ ? 'list' : 'set';
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         let isIncomplete = false;
         let typeErrors = false;
@@ -9736,12 +9769,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const expectedTypeDiagAddendum = new diagnostic_1.DiagnosticAddendum();
         node.entries.forEach((entry) => {
             let entryTypeResult;
-            if (entry.nodeType === 32 /* ParseNodeType.ListComprehension */) {
-                entryTypeResult = getElementTypeFromListComprehension(entry, expectedEntryType);
+            if (entry.nodeType === 11 /* ParseNodeType.Comprehension */) {
+                entryTypeResult = getElementTypeFromComprehension(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, expectedEntryType);
             }
             else {
-                entryTypeResult = getTypeOfExpression(entry, 
-                /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedEntryType));
+                entryTypeResult = getTypeOfExpression(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(expectedEntryType));
             }
             entryTypes.push(entryTypeResult.type);
             if (entryTypeResult.isIncomplete) {
@@ -9795,8 +9827,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return specializedListOrSet.typeArguments[0];
     }
     // Attempts to infer the type of a list or set statement with no "expected type".
-    function getTypeOfListOrSetInferred(node, hasExpectedType) {
-        const builtInClassName = node.nodeType === 31 /* ParseNodeType.List */ ? 'list' : 'set';
+    function getTypeOfListOrSetInferred(node, flags, hasExpectedType) {
+        const builtInClassName = node.nodeType === 34 /* ParseNodeType.List */ ? 'list' : 'set';
         const verifyHashable = node.nodeType === 45 /* ParseNodeType.Set */;
         let isEmptyContainer = false;
         let isIncomplete = false;
@@ -9804,11 +9836,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let entryTypes = [];
         node.entries.forEach((entry, index) => {
             let entryTypeResult;
-            if (entry.nodeType === 32 /* ParseNodeType.ListComprehension */ && !entry.isGenerator) {
-                entryTypeResult = getElementTypeFromListComprehension(entry);
+            if (entry.nodeType === 11 /* ParseNodeType.Comprehension */ && !entry.isGenerator) {
+                entryTypeResult = getElementTypeFromComprehension(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */);
             }
             else {
-                entryTypeResult = getTypeOfExpression(entry);
+                entryTypeResult = getTypeOfExpression(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */);
             }
             if (entryTypeResult.isIncomplete) {
                 isIncomplete = true;
@@ -10124,14 +10156,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type: functionType, isIncomplete, typeErrors };
     }
-    function getTypeOfListComprehension(node, inferenceContext) {
+    function getTypeOfComprehension(node, flags, inferenceContext) {
         let isIncomplete = false;
         let typeErrors = false;
         // If any of the "for" clauses are marked async or any of the "if" clauses
         // or any clause other than the leftmost "for" contain an "await" operator,
         // it is treated as an async generator.
         let isAsync = node.forIfNodes.some((comp, index) => {
-            if (comp.nodeType === 33 /* ParseNodeType.ListComprehensionFor */ && comp.isAsync) {
+            if (comp.nodeType === 12 /* ParseNodeType.ComprehensionFor */ && comp.isAsync) {
                 return true;
             }
             return index > 0 && ParseTreeUtils.containsAwaitNode(comp);
@@ -10142,7 +10174,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         const builtInIteratorType = getTypingType(node, isAsync ? 'AsyncGenerator' : 'Generator');
         const expectedEntryType = getExpectedEntryTypeForIterable(node, builtInIteratorType, inferenceContext);
-        const elementTypeResult = getElementTypeFromListComprehension(node, expectedEntryType);
+        const elementTypeResult = getElementTypeFromComprehension(node, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, expectedEntryType);
         if (elementTypeResult.isIncomplete) {
             isIncomplete = true;
         }
@@ -10186,10 +10218,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
         }
     }
-    function evaluateListComprehensionForIf(node) {
+    function evaluateComprehensionForIf(node) {
         var _a;
         let isIncomplete = false;
-        if (node.nodeType === 33 /* ParseNodeType.ListComprehensionFor */) {
+        if (node.nodeType === 12 /* ParseNodeType.ComprehensionFor */) {
             const iterableTypeResult = getTypeOfExpression(node.iterableExpression);
             if (iterableTypeResult.isIncomplete) {
                 isIncomplete = true;
@@ -10200,7 +10232,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             assignTypeToExpression(targetExpr, itemTypeResult.type, !!itemTypeResult.isIncomplete, node.iterableExpression);
         }
         else {
-            (0, debug_1.assert)(node.nodeType === 34 /* ParseNodeType.ListComprehensionIf */);
+            (0, debug_1.assert)(node.nodeType === 13 /* ParseNodeType.ComprehensionIf */);
             // Evaluate the test expression to validate it and mark symbols
             // as referenced. Don't bother doing this if we're in speculative
             // mode because it doesn't affect the element type.
@@ -10210,22 +10242,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return isIncomplete;
     }
-    // Returns the type of one entry returned by the list comprehension,
-    // as opposed to the entire list.
-    function getElementTypeFromListComprehension(node, expectedValueOrElementType, expectedKeyType) {
+    // Returns the type of one entry returned by the comprehension.
+    function getElementTypeFromComprehension(node, flags, expectedValueOrElementType, expectedKeyType) {
         let isIncomplete = false;
         let typeErrors = false;
         // "Execute" the list comprehensions from start to finish.
         for (const forIfNode of node.forIfNodes) {
-            if (evaluateListComprehensionForIf(forIfNode)) {
+            if (evaluateComprehensionForIf(forIfNode)) {
                 isIncomplete = true;
             }
         }
         let type = types_1.UnknownType.create();
-        if (node.expression.nodeType === 17 /* ParseNodeType.DictionaryKeyEntry */) {
+        if (node.expression.nodeType === 20 /* ParseNodeType.DictionaryKeyEntry */) {
             // Create a tuple with the key/value types.
-            const keyTypeResult = getTypeOfExpression(node.expression.keyExpression, 
-            /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedKeyType));
+            const keyTypeResult = getTypeOfExpression(node.expression.keyExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedKeyType));
             if (keyTypeResult.isIncomplete) {
                 isIncomplete = true;
             }
@@ -10236,8 +10266,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (!expectedKeyType || !(0, typeUtils_1.containsLiteralType)(expectedKeyType)) {
                 keyType = stripLiteralValue(keyType);
             }
-            const valueTypeResult = getTypeOfExpression(node.expression.valueExpression, 
-            /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
+            const valueTypeResult = getTypeOfExpression(node.expression.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
             if (valueTypeResult.isIncomplete) {
                 isIncomplete = true;
             }
@@ -10253,14 +10282,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 { type: valueType, isUnbounded: false },
             ]);
         }
-        else if (node.expression.nodeType === 16 /* ParseNodeType.DictionaryExpandEntry */) {
+        else if (node.expression.nodeType === 19 /* ParseNodeType.DictionaryExpandEntry */) {
             // The parser should have reported an error in this case because it's not allowed.
-            getTypeOfExpression(node.expression.expandExpression, 
-            /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
+            getTypeOfExpression(node.expression.expandExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
         }
         else if ((0, parseNodes_1.isExpressionNode)(node)) {
-            const exprTypeResult = getTypeOfExpression(node.expression, 
-            /* flags */ undefined, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
+            const exprTypeResult = getTypeOfExpression(node.expression, flags, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
             if (exprTypeResult.isIncomplete) {
                 isIncomplete = true;
             }
@@ -10478,9 +10505,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addExpectedClassDiagnostic(typeArg0Type, typeArgs[0].node);
             typeArg0Type = types_1.UnknownType.create();
         }
-        let optionalType = (0, types_1.combineTypes)([typeArg0Type, noneClassType !== null && noneClassType !== void 0 ? noneClassType : types_1.UnknownType.create()]);
-        if (unionClassType && (0, types_1.isInstantiableClass)(unionClassType)) {
-            optionalType = types_1.TypeBase.cloneAsSpecialForm(optionalType, types_1.ClassType.cloneAsInstance(unionClassType));
+        let optionalType = (0, types_1.combineTypes)([typeArg0Type, noneTypeClass !== null && noneTypeClass !== void 0 ? noneTypeClass : types_1.UnknownType.create()]);
+        if (unionTypeClass && (0, types_1.isInstantiableClass)(unionTypeClass)) {
+            optionalType = types_1.TypeBase.cloneAsSpecialForm(optionalType, types_1.ClassType.cloneAsInstance(unionTypeClass));
         }
         return optionalType;
     }
@@ -10540,7 +10567,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     type = cloneBuiltinClassWithLiteral(node, classType, 'int', itemExpr.value);
                 }
             }
-            else if (itemExpr.nodeType === 11 /* ParseNodeType.Constant */) {
+            else if (itemExpr.nodeType === 14 /* ParseNodeType.Constant */) {
                 if (itemExpr.constType === 33 /* KeywordType.True */) {
                     type = cloneBuiltinClassWithLiteral(node, classType, 'bool', true);
                 }
@@ -10548,7 +10575,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     type = cloneBuiltinClassWithLiteral(node, classType, 'bool', false);
                 }
                 else if (itemExpr.constType === 26 /* KeywordType.None */) {
-                    type = noneClassType !== null && noneClassType !== void 0 ? noneClassType : types_1.UnknownType.create();
+                    type = noneTypeClass !== null && noneTypeClass !== void 0 ? noneTypeClass : types_1.UnknownType.create();
                 }
             }
             else if (itemExpr.nodeType === 55 /* ParseNodeType.UnaryOperation */) {
@@ -10592,8 +10619,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             literalTypes.push(type);
         }
         let result = (0, types_1.combineTypes)(literalTypes);
-        if ((0, types_1.isUnion)(result) && unionClassType && (0, types_1.isInstantiableClass)(unionClassType)) {
-            result = types_1.TypeBase.cloneAsSpecialForm(result, types_1.ClassType.cloneAsInstance(unionClassType));
+        if ((0, types_1.isUnion)(result) && unionTypeClass && (0, types_1.isInstantiableClass)(unionTypeClass)) {
+            result = types_1.TypeBase.cloneAsSpecialForm(result, types_1.ClassType.cloneAsInstance(unionTypeClass));
         }
         return result;
     }
@@ -10987,6 +11014,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         for (const typeArg of typeArgs) {
             let typeArgType = typeArg.type;
+            // This is an experimental feature because Unions of unpacked TypeVarTuples are not officially supported.
             if (!validateTypeArg(typeArg, {
                 allowVariadicTypeVar: fileInfo.diagnosticRuleSet.enableExperimentalFeatures,
             })) {
@@ -10998,6 +11026,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             // If this is an unpacked tuple, explode out the individual items.
             if ((0, types_1.isUnpackedClass)(typeArg.type) && typeArg.type.tupleTypeArguments) {
+                // This is an experimental feature because Unions of unpacked TypeVarTuples are not officially supported.
                 if (fileInfo.diagnosticRuleSet.enableExperimentalFeatures) {
                     typeArg.type.tupleTypeArguments.forEach((tupleTypeArg) => {
                         types.push((0, typeUtils_1.convertToInstantiable)(tupleTypeArg.type));
@@ -11011,6 +11040,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             else {
                 if ((0, types_1.isTypeVar)(typeArgType) && (0, types_1.isUnpackedVariadicTypeVar)(typeArgType)) {
+                    // This is an experimental feature because Unions of unpacked TypeVarTuples are not officially supported.
                     if (fileInfo.diagnosticRuleSet.enableExperimentalFeatures) {
                         // If this is an unpacked TypeVar, note that it is in a union so we can
                         // differentiate between Unpack[Vs] and Union[Unpack[Vs]].
@@ -11032,8 +11062,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             addDiagnostic(diagnosticRules_1.DiagnosticRule.reportInvalidTypeArguments, localize_1.LocMessage.unionTypeArgCount(), errorNode);
         }
         let unionType = (0, types_1.combineTypes)(types);
-        if (unionClassType && (0, types_1.isInstantiableClass)(unionClassType)) {
-            unionType = types_1.TypeBase.cloneAsSpecialForm(unionType, types_1.ClassType.cloneAsInstance(unionClassType));
+        if (unionTypeClass && (0, types_1.isInstantiableClass)(unionTypeClass)) {
+            unionType = types_1.TypeBase.cloneAsSpecialForm(unionType, types_1.ClassType.cloneAsInstance(unionTypeClass));
         }
         return unionType;
     }
@@ -11260,7 +11290,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             // Handle 'LiteralString' specially because we want it to act as
             // though it derives from 'str'.
             if (assignedName === 'LiteralString') {
-                specialType.details.baseClasses.push(strClassType !== null && strClassType !== void 0 ? strClassType : types_1.AnyType.create());
+                specialType.details.baseClasses.push(strClass !== null && strClass !== void 0 ? strClass : types_1.AnyType.create());
                 (0, typeUtils_1.computeMroLinearization)(specialType);
             }
             writeTypeCache(node, { type: specialType }, 0 /* EvaluatorFlags.None */);
@@ -11538,7 +11568,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         return `__type_of_${paramName}`;
     }
     function getTypeOfClass(node) {
-        initializedBasicTypes(node);
+        initializePrefetchedTypes(node);
         // Is this type already cached?
         const cachedClassType = readTypeCache(node.name, 0 /* EvaluatorFlags.None */);
         if (cachedClassType) {
@@ -11800,6 +11830,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             classType.details.flags |= 1024 /* ClassTypeFlags.CanOmitDictValues */;
                         }
                         else if (arg.name.value === 'closed' && constArgValue) {
+                            // This is an experimental feature because PEP 728 hasn't been accepted yet.
                             if (AnalyzerNodeInfo.getFileInfo(node).diagnosticRuleSet.enableExperimentalFeatures) {
                                 classType.details.flags |=
                                     256 /* ClassTypeFlags.TypedDictMarkedClosed */ | 512 /* ClassTypeFlags.TypedDictEffectivelyClosed */;
@@ -12155,9 +12186,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         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;
@@ -12184,8 +12212,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (p.details.isVariadic) {
                     return p;
                 }
-                (0, debug_1.assert)(objectType !== undefined);
-                return i === paramIndex ? objectType : dummyTypeObject;
+                return i === paramIndex ? getObjectType() : dummyTypeObject;
             });
             // Replace all type arguments with a dummy type except for the
             // TypeVar of interest, which is replaced with itself.
@@ -12242,7 +12269,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (!effectiveMetaclass || (0, types_1.isInstantiableClass)(effectiveMetaclass)) {
             for (const baseClass of classType.details.baseClasses) {
                 if ((0, types_1.isInstantiableClass)(baseClass)) {
-                    const baseClassMeta = baseClass.details.effectiveMetaclass || typeClassType;
+                    const baseClassMeta = baseClass.details.effectiveMetaclass || typeClass;
                     if (baseClassMeta && (0, types_1.isInstantiableClass)(baseClassMeta)) {
                         // Make sure there is no metaclass conflict.
                         if (!effectiveMetaclass) {
@@ -12448,7 +12475,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (initSubclassMethodType && initSubclassMethodInfo.classType) {
                     const callResult = validateCallArguments(errorNode, argList, { type: initSubclassMethodType }, 
                     /* typeVarContext */ undefined, 
-                    /* skipUnknownArgCheck */ false, (0, typeUtils_1.makeInferenceContext)(getNoneType()));
+                    /* skipUnknownArgCheck */ false, (0, typeUtils_1.makeInferenceContext)(getNoneType()), 
+                    /* signatureTracker */ undefined);
                     if (callResult.argumentErrors) {
                         const diag = addDiagnostic(diagnosticRules_1.DiagnosticRule.reportGeneralTypeIssues, localize_1.LocMessage.initSubclassCallFailed(), node.name);
                         const initSubclassFunction = (0, types_1.isOverloadedFunction)(initSubclassMethodType)
@@ -12474,7 +12502,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         });
     }
     function getTypeOfFunction(node) {
-        initializedBasicTypes(node);
+        initializePrefetchedTypes(node);
         // Is this predecorated function type cached?
         let functionType = readTypeCache(node.name, 0 /* EvaluatorFlags.None */);
         if (functionType) {
@@ -12901,7 +12929,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // the type checker should assume that the type is optional (i.e. a union
         // of the specified type and 'None'). Skip this step if the type is already
         // optional to avoid losing alias names when combining the types.
-        if (((_a = param.defaultValue) === null || _a === void 0 ? void 0 : _a.nodeType) === 11 /* ParseNodeType.Constant */ &&
+        if (((_a = param.defaultValue) === null || _a === void 0 ? void 0 : _a.nodeType) === 14 /* ParseNodeType.Constant */ &&
             param.defaultValue.constType === 26 /* KeywordType.None */ &&
             !(0, typeUtils_1.isOptionalType)(type) &&
             !AnalyzerNodeInfo.getFileInfo(param).diagnosticRuleSet.strictParameterNoneValue) {
@@ -13467,7 +13495,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         let symbolType = getAliasedSymbolTypeForName(node, aliasNode.value);
         if (!symbolType) {
             const parentNode = node.parent;
-            (0, debug_1.assert)(parentNode && parentNode.nodeType === 22 /* ParseNodeType.ImportFrom */);
+            (0, debug_1.assert)(parentNode && parentNode.nodeType === 25 /* ParseNodeType.ImportFrom */);
             (0, debug_1.assert)(!parentNode.isWildcardImport);
             const importInfo = AnalyzerNodeInfo.getImportInfo(parentNode.module);
             if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib) {
@@ -13659,7 +13687,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if (!resolvedAliasInfo.declaration) {
             return evaluatorOptions.evaluateUnknownImportsAsAny ? types_1.AnyType.create() : types_1.UnknownType.create();
         }
-        if (node.nodeType === 23 /* ParseNodeType.ImportFromAs */) {
+        if (node.nodeType === 26 /* ParseNodeType.ImportFromAs */) {
             if (resolvedAliasInfo.isPrivate) {
                 addDiagnostic(diagnosticRules_1.DiagnosticRule.reportPrivateUsage, localize_1.LocMessage.privateUsedOutsideOfModule().format({
                     name: node.name.value,
@@ -13689,7 +13717,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // is technically not part of an expression. We'll handle these here so
         // callers don't need to include special-case logic.
         if (node.nodeType === 38 /* ParseNodeType.Name */ && node.parent) {
-            if (node.parent.nodeType === 28 /* ParseNodeType.Function */ && node.parent.name === node) {
+            if (node.parent.nodeType === 31 /* ParseNodeType.Function */ && node.parent.name === node) {
                 getTypeOfFunction(node.parent);
                 return;
             }
@@ -13697,11 +13725,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 getTypeOfClass(node.parent);
                 return;
             }
-            if (node.parent.nodeType === 23 /* ParseNodeType.ImportFromAs */) {
+            if (node.parent.nodeType === 26 /* ParseNodeType.ImportFromAs */) {
                 evaluateTypesForImportFromAs(node.parent);
                 return;
             }
-            if (node.parent.nodeType === 21 /* ParseNodeType.ImportAs */) {
+            if (node.parent.nodeType === 24 /* ParseNodeType.ImportAs */) {
                 evaluateTypesForImportAs(node.parent);
                 return;
             }
@@ -13709,7 +13737,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 getTypeOfTypeAlias(node.parent);
                 return;
             }
-            if (node.parent.nodeType === 29 /* ParseNodeType.Global */ || node.parent.nodeType === 39 /* ParseNodeType.Nonlocal */) {
+            if (node.parent.nodeType === 32 /* ParseNodeType.Global */ || node.parent.nodeType === 39 /* ParseNodeType.Nonlocal */) {
                 // For global and nonlocal statements, allow forward references so
                 // we don't use code flow during symbol lookups.
                 getTypeOfExpression(node, 4 /* EvaluatorFlags.AllowForwardReferences */);
@@ -13745,7 +13773,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 evaluateTypesForTypeAnnotationNode(annotationParent);
                 return;
             }
-            if (annotationParent.nodeType === 28 /* ParseNodeType.Function */ &&
+            if (annotationParent.nodeType === 31 /* ParseNodeType.Function */ &&
                 annotationNode === annotationParent.returnTypeAnnotation) {
                 getTypeOfAnnotation(annotationNode, {
                     associateTypeVarsWithScope: true,
@@ -13781,7 +13809,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (argumentNode && argumentNode !== nodeToEvaluate) {
                 (0, debug_1.assert)(argumentNode.parent !== undefined);
                 if (argumentNode.parent.nodeType === 9 /* ParseNodeType.Call */ ||
-                    argumentNode.parent.nodeType === 24 /* ParseNodeType.Index */) {
+                    argumentNode.parent.nodeType === 27 /* ParseNodeType.Index */) {
                     nodeToEvaluate = argumentNode.parent;
                     continue;
                 }
@@ -13813,7 +13841,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         continue;
                     }
                     // Handle the special case where the LHS is a call to a lambda.
-                    if (parent.nodeType === 9 /* ParseNodeType.Call */ && nodeToEvaluate.nodeType === 30 /* ParseNodeType.Lambda */) {
+                    if (parent.nodeType === 9 /* ParseNodeType.Call */ && nodeToEvaluate.nodeType === 33 /* ParseNodeType.Lambda */) {
                         nodeToEvaluate = parent;
                         continue;
                     }
@@ -13821,7 +13849,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     break;
                 }
             }
-            else if (parent.nodeType === 24 /* ParseNodeType.Index */) {
+            else if (parent.nodeType === 27 /* ParseNodeType.Index */) {
                 // The base expression of an index expression is not contextual.
                 if (nodeToEvaluate === parent.baseExpression) {
                     flags = 2 /* EvaluatorFlags.IndexBaseDefaults */;
@@ -13841,17 +13869,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // stop. However, there are a few special "pass through"
                 // node types that we can skip over to get to a known
                 // expression node.
-                if (parent.nodeType === 17 /* ParseNodeType.DictionaryKeyEntry */ ||
-                    parent.nodeType === 16 /* ParseNodeType.DictionaryExpandEntry */ ||
-                    parent.nodeType === 33 /* ParseNodeType.ListComprehensionFor */ ||
-                    parent.nodeType === 34 /* ParseNodeType.ListComprehensionIf */) {
+                if (parent.nodeType === 20 /* ParseNodeType.DictionaryKeyEntry */ ||
+                    parent.nodeType === 19 /* ParseNodeType.DictionaryExpandEntry */ ||
+                    parent.nodeType === 12 /* ParseNodeType.ComprehensionFor */ ||
+                    parent.nodeType === 13 /* ParseNodeType.ComprehensionIf */) {
                     (0, debug_1.assert)(parent.parent !== undefined && (0, parseNodes_1.isExpressionNode)(parent.parent));
                     parent = parent.parent;
                 }
                 else if (parent.nodeType === 41 /* ParseNodeType.Parameter */) {
                     (0, debug_1.assert)(parent.parent !== undefined);
                     // Parameters are contextual for lambdas.
-                    if (parent.parent.nodeType === 30 /* ParseNodeType.Lambda */) {
+                    if (parent.parent.nodeType === 33 /* ParseNodeType.Lambda */) {
                         parent = parent.parent;
                     }
                     else {
@@ -13876,7 +13904,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const parent = nodeToEvaluate.parent;
         (0, debug_1.assert)(parent !== undefined);
         switch (parent.nodeType) {
-            case 14 /* ParseNodeType.Del */: {
+            case 17 /* ParseNodeType.Del */: {
                 verifyDeleteExpression(nodeToEvaluate);
                 return;
             }
@@ -13895,11 +13923,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 getTypeOfTypeAlias(parent);
                 return;
             }
-            case 13 /* ParseNodeType.Decorator */: {
+            case 16 /* ParseNodeType.Decorator */: {
                 if (((_d = parent.parent) === null || _d === void 0 ? void 0 : _d.nodeType) === 10 /* ParseNodeType.Class */) {
                     getTypeOfClass(parent.parent);
                 }
-                else if (((_e = parent.parent) === null || _e === void 0 ? void 0 : _e.nodeType) === 28 /* ParseNodeType.Function */) {
+                else if (((_e = parent.parent) === null || _e === void 0 ? void 0 : _e.nodeType) === 31 /* ParseNodeType.Function */) {
                     getTypeOfFunction(parent.parent);
                 }
                 return;
@@ -13961,11 +13989,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // be inferred, whereas the latter sometimes have type annotations
         // but cannot be inferred.
         const parent = node.parent;
-        if (parent.nodeType === 30 /* ParseNodeType.Lambda */) {
+        if (parent.nodeType === 33 /* ParseNodeType.Lambda */) {
             evaluateTypesForExpressionInContext(parent);
             return;
         }
-        (0, debug_1.assert)(parent.nodeType === 28 /* ParseNodeType.Function */);
+        (0, debug_1.assert)(parent.nodeType === 31 /* ParseNodeType.Function */);
         const functionNode = parent;
         const paramIndex = functionNode.parameters.findIndex((param) => param === node);
         const typeAnnotation = ParseTreeUtils.getTypeAnnotationForParameter(functionNode, paramIndex);
@@ -14001,7 +14029,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // be evaluated to provide sufficient context for the type. Evaluated types
     // are written back to the type cache for later retrieval.
     function evaluateTypesForStatement(node) {
-        initializedBasicTypes(node);
+        initializePrefetchedTypes(node);
         let curNode = node;
         while (curNode) {
             switch (curNode.nodeType) {
@@ -14039,19 +14067,19 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     evaluateTypeOfParameter(curNode);
                     return;
                 }
-                case 30 /* ParseNodeType.Lambda */: {
+                case 33 /* ParseNodeType.Lambda */: {
                     evaluateTypesForExpressionInContext(curNode);
                     return;
                 }
-                case 28 /* ParseNodeType.Function */: {
+                case 31 /* ParseNodeType.Function */: {
                     getTypeOfFunction(curNode);
                     return;
                 }
-                case 26 /* ParseNodeType.For */: {
+                case 29 /* ParseNodeType.For */: {
                     evaluateTypesForForStatement(curNode);
                     return;
                 }
-                case 25 /* ParseNodeType.Except */: {
+                case 28 /* ParseNodeType.Except */: {
                     evaluateTypesForExceptStatement(curNode);
                     return;
                 }
@@ -14059,17 +14087,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     evaluateTypesForWithStatement(curNode);
                     return;
                 }
-                case 33 /* ParseNodeType.ListComprehensionFor */: {
-                    const listComprehension = curNode.parent;
-                    (0, debug_1.assert)(listComprehension.nodeType === 32 /* ParseNodeType.ListComprehension */);
-                    if (curNode === listComprehension.expression) {
-                        evaluateTypesForExpressionInContext(listComprehension);
+                case 12 /* ParseNodeType.ComprehensionFor */: {
+                    const comprehension = curNode.parent;
+                    (0, debug_1.assert)(comprehension.nodeType === 11 /* ParseNodeType.Comprehension */);
+                    if (curNode === comprehension.expression) {
+                        evaluateTypesForExpressionInContext(comprehension);
                     }
                     else {
                         // Evaluate the individual iterations starting with the first
                         // up to the curNode.
-                        for (const forIfNode of listComprehension.forIfNodes) {
-                            evaluateListComprehensionForIf(forIfNode);
+                        for (const forIfNode of comprehension.forIfNodes) {
+                            evaluateComprehensionForIf(forIfNode);
                             if (forIfNode === curNode) {
                                 break;
                             }
@@ -14077,15 +14105,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                     return;
                 }
-                case 21 /* ParseNodeType.ImportAs */: {
+                case 24 /* ParseNodeType.ImportAs */: {
                     evaluateTypesForImportAs(curNode);
                     return;
                 }
-                case 23 /* ParseNodeType.ImportFromAs */: {
+                case 26 /* ParseNodeType.ImportFromAs */: {
                     evaluateTypesForImportFromAs(curNode);
                     return;
                 }
-                case 22 /* ParseNodeType.ImportFrom */: {
+                case 25 /* ParseNodeType.ImportFrom */: {
                     evaluateTypesForImportFrom(curNode);
                     return;
                 }
@@ -14309,8 +14337,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         return { type: types_1.UnknownType.create() };
                     }
                 }
-                if (typeClassType && (0, types_1.isInstantiableClass)(typeClassType)) {
-                    let typeType = createSpecialType(typeClassType, typeArgs, 1, 
+                if (typeClass && (0, types_1.isInstantiableClass)(typeClass)) {
+                    let typeType = createSpecialType(typeClass, typeArgs, 1, 
                     /* allowParamSpec */ undefined, 
                     /* isSpecialForm */ false);
                     if ((0, types_1.isInstantiableClass)(typeType)) {
@@ -14547,9 +14575,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const specializedClass = types_1.ClassType.cloneForSpecialization(classType, typeArgTypes, typeArgs !== undefined);
         return { type: specializedClass };
     }
-    function getTypeOfArgument(arg, inferenceContext) {
+    function getTypeOfArgument(arg, inferenceContext, signatureTracker) {
+        var _a, _b;
         if (arg.typeResult) {
-            return { type: arg.typeResult.type, isIncomplete: arg.typeResult.isIncomplete };
+            const type = (_b = (_a = arg.typeResult.type) === null || _a === void 0 ? void 0 : _a.specialForm) !== null && _b !== void 0 ? _b : arg.typeResult.type;
+            return { type, isIncomplete: arg.typeResult.isIncomplete };
         }
         if (!arg.valueExpression) {
             // We shouldn't ever get here, but just in case.
@@ -14557,7 +14587,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         // If there was no defined type provided, there should always
         // be a value expression from which we can retrieve the type.
-        return getTypeOfExpression(arg.valueExpression, /* flags */ undefined, inferenceContext);
+        const typeResult = getTypeOfExpression(arg.valueExpression, 
+        /* flags */ undefined, inferenceContext, signatureTracker);
+        if (signatureTracker) {
+            typeResult.type = (0, typeUtils_1.ensureFunctionSignaturesAreUnique)(typeResult.type, signatureTracker, arg.valueExpression.start);
+        }
+        return typeResult;
     }
     // This function is like getTypeOfArgument except that it is
     // used in cases where the argument is expected to be a type
@@ -14641,7 +14676,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // Functions and list comprehensions don't allow access to implicitly
         // aliased symbols in outer scopes if they haven't yet been assigned
         // within the local scope.
-        let scopeTypeHonorsCodeFlow = scopeType !== 2 /* ScopeType.Function */ && scopeType !== 1 /* ScopeType.ListComprehension */;
+        let scopeTypeHonorsCodeFlow = scopeType !== 2 /* ScopeType.Function */ && scopeType !== 1 /* ScopeType.Comprehension */;
         // TypeParameter scopes don't honor code flow, but if the symbol is resolved
         // using the proxy scope for the TypeParameter scope, we should use code flow.
         if (scopeType === 0 /* ScopeType.TypeParameter */ && symbolWithScope && symbolWithScope.scope === scope) {
@@ -14845,7 +14880,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     function getAliasFromImport(node) {
         if (node.parent &&
-            node.parent.nodeType === 23 /* ParseNodeType.ImportFromAs */ &&
+            node.parent.nodeType === 26 /* ParseNodeType.ImportFromAs */ &&
             node.parent.alias &&
             node === node.parent.name) {
             return node.parent.alias;
@@ -15076,7 +15111,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // has a function-level annotation comment that provides
                 // this parameter's annotation type.
                 if (!typeAnnotationNode) {
-                    if (((_a = declaration.node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 28 /* ParseNodeType.Function */) {
+                    if (((_a = declaration.node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 31 /* ParseNodeType.Function */) {
                         const functionNode = declaration.node.parent;
                         if (functionNode.functionAnnotationComment &&
                             !functionNode.functionAnnotationComment.isParamListEllipsis) {
@@ -15244,7 +15279,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // Set the variance to "auto" for class-scoped TypeVars.
                 typeVar.details.declaredVariance = 0 /* Variance.Auto */;
             }
-            else if (scopeNode.nodeType === 28 /* ParseNodeType.Function */) {
+            else if (scopeNode.nodeType === 31 /* ParseNodeType.Function */) {
                 scopeType = 1 /* TypeVarScopeType.Function */;
             }
             else {
@@ -15832,7 +15867,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function getFunctionEffectiveReturnType(type, callSiteInfo, inferTypeIfNeeded = true) {
         const specializedReturnType = types_1.FunctionType.getSpecializedReturnType(type, /* includeInferred */ false);
         if (specializedReturnType && !(0, types_1.isUnknown)(specializedReturnType)) {
-            return adjustCallableReturnType(type, specializedReturnType, /* liveTypeVarScopes */ []);
+            const liveTypeVarScopes = (callSiteInfo === null || callSiteInfo === void 0 ? void 0 : callSiteInfo.errorNode)
+                ? ParseTreeUtils.getTypeVarScopesForNode(callSiteInfo === null || callSiteInfo === void 0 ? void 0 : callSiteInfo.errorNode)
+                : [];
+            return adjustCallableReturnType(type, specializedReturnType, liveTypeVarScopes);
         }
         if (inferTypeIfNeeded) {
             return getFunctionInferredReturnType(type, callSiteInfo);
@@ -16086,7 +16124,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     function getTypeOfMember(member) {
         if ((0, types_1.isInstantiableClass)(member.classType)) {
             return (0, typeUtils_1.partiallySpecializeType)(getEffectiveTypeOfSymbol(member.symbol), member.classType, 
-            /* selfClass */ undefined, typeClassType !== null && typeClassType !== void 0 ? typeClassType : types_1.UnknownType.create());
+            /* selfClass */ undefined, typeClass !== null && typeClass !== void 0 ? typeClass : types_1.UnknownType.create());
         }
         return types_1.UnknownType.create();
     }
@@ -16163,22 +16201,22 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (types_1.ClassType.isBuiltIn(destType, 'Mapping')) {
                 const mappingValueType = (0, typedDicts_1.getTypedDictMappingEquivalent)(evaluatorInterface, srcType);
                 if (mappingValueType &&
-                    mappingType &&
-                    (0, types_1.isInstantiableClass)(mappingType) &&
-                    strClassType &&
-                    (0, types_1.isInstantiableClass)(strClassType)) {
-                    srcType = types_1.ClassType.cloneForSpecialization(mappingType, [types_1.ClassType.cloneAsInstance(strClassType), mappingValueType], 
+                    mappingClass &&
+                    (0, types_1.isInstantiableClass)(mappingClass) &&
+                    strClass &&
+                    (0, types_1.isInstantiableClass)(strClass)) {
+                    srcType = types_1.ClassType.cloneForSpecialization(mappingClass, [types_1.ClassType.cloneAsInstance(strClass), mappingValueType], 
                     /* isTypeArgumentExplicit */ true);
                 }
             }
             else if (types_1.ClassType.isBuiltIn(destType, ['dict', 'MutableMapping'])) {
                 const dictValueType = (0, typedDicts_1.getTypedDictDictEquivalent)(evaluatorInterface, srcType, recursionCount);
                 if (dictValueType &&
-                    dictClassType &&
-                    (0, types_1.isInstantiableClass)(dictClassType) &&
-                    strClassType &&
-                    (0, types_1.isInstantiableClass)(strClassType)) {
-                    srcType = types_1.ClassType.cloneForSpecialization(dictClassType, [types_1.ClassType.cloneAsInstance(strClassType), dictValueType], 
+                    dictClass &&
+                    (0, types_1.isInstantiableClass)(dictClass) &&
+                    strClass &&
+                    (0, types_1.isInstantiableClass)(strClass)) {
+                    srcType = types_1.ClassType.cloneForSpecialization(dictClass, [types_1.ClassType.cloneAsInstance(strClass), dictValueType], 
                     /* isTypeArgumentExplicit */ true);
                 }
             }
@@ -16224,24 +16262,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 return true;
             }
         }
-        const destErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(destType) : destType;
-        const srcErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(srcType) : srcType;
-        let destErrorTypeText = printType(destErrorType);
-        let srcErrorTypeText = printType(srcErrorType);
-        // If the text is the same, use the fully-qualified name rather than the short name.
-        if (destErrorTypeText === srcErrorTypeText && destType.details.fullName && srcType.details.fullName) {
-            destErrorTypeText = destType.details.fullName;
-            srcErrorTypeText = srcType.details.fullName;
-        }
-        diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeIncompatible().format({
-            sourceType: srcErrorTypeText,
-            destType: destErrorTypeText,
-        }));
-        // Tell the user about the disableBytesTypePromotions if that is involved.
-        if (types_1.ClassType.isBuiltIn(destType, 'bytes')) {
-            const promotions = typePromotions.get(destType.details.fullName);
-            if (promotions && promotions.some((name) => name === srcType.details.fullName)) {
-                diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.bytesTypePromotions());
+        if (diag) {
+            const destErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(destType) : destType;
+            const srcErrorType = reportErrorsUsingObjType ? types_1.ClassType.cloneAsInstance(srcType) : srcType;
+            let destErrorTypeText = printType(destErrorType);
+            let srcErrorTypeText = printType(srcErrorType);
+            // If the text is the same, use the fully-qualified name rather than the short name.
+            if (destErrorTypeText === srcErrorTypeText && destType.details.fullName && srcType.details.fullName) {
+                destErrorTypeText = destType.details.fullName;
+                srcErrorTypeText = srcType.details.fullName;
+            }
+            diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeIncompatible().format({
+                sourceType: srcErrorTypeText,
+                destType: destErrorTypeText,
+            }));
+            // Tell the user about the disableBytesTypePromotions if that is involved.
+            if (types_1.ClassType.isBuiltIn(destType, 'bytes')) {
+                const promotions = typePromotions.get(destType.details.fullName);
+                if (promotions && promotions.some((name) => name === srcType.details.fullName)) {
+                    diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.bytesTypePromotions());
+                }
             }
         }
         return false;
@@ -16403,7 +16443,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // If the only removed arg from the dest type args is itself a variadic,
                 // don't bother adjusting it.
                 const skipAdjustment = destArgsToCapture === 1 && (0, types_1.isVariadicTypeVar)(destTypeArgs[srcVariadicIndex].type);
-                if (!skipAdjustment && tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
+                if (!skipAdjustment && tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
                     const removedArgs = destTypeArgs.splice(srcVariadicIndex, destArgsToCapture);
                     // Package up the remaining type arguments into a tuple object.
                     const variadicTuple = makeTupleObject(removedArgs.map((typeArg) => {
@@ -16427,7 +16467,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // If the dest contains a variadic element, determine which source
                 // args map to this element and package them up into an unpacked tuple.
                 if ((0, types_1.isVariadicTypeVar)(destTypeArgs[destUnboundedOrVariadicIndex].type)) {
-                    if (tupleClassType && (0, types_1.isInstantiableClass)(tupleClassType)) {
+                    if (tupleClass && (0, types_1.isInstantiableClass)(tupleClass)) {
                         const removedArgs = srcTypeArgs.splice(destUnboundedOrVariadicIndex, srcArgsToCapture);
                         let variadicTuple;
                         // If we're left with a single unpacked variadic type var, there's no
@@ -16892,20 +16932,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // rather than dest. If the type variable is not in the scope of the
                 // provided TypeVarContext, simply verify that the concrete types are
                 // compatible.
-                if (!srcTypeVarContext || !srcTypeVarContext.hasSolveForScope((0, typeUtils_1.getTypeVarScopeId)(srcType))) {
+                if ((flags & 1024 /* AssignTypeFlags.IgnoreTypeVarScope */) === 0 &&
+                    (!srcTypeVarContext || !srcTypeVarContext.hasSolveForScope((0, typeUtils_1.getTypeVarScopeId)(srcType)))) {
                     return assignType(makeTopLevelTypeVarsConcrete(destType), makeTopLevelTypeVarsConcrete(srcType), diag, 
                     /* destTypeVarContext */ undefined, 
                     /* srcTypeVarContext */ undefined, originalFlags, recursionCount);
                 }
                 else {
-                    if ((0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, srcType, destType, diag, srcTypeVarContext, originalFlags, recursionCount)) {
+                    if ((0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, srcType, destType, diag, srcTypeVarContext !== null && srcTypeVarContext !== void 0 ? srcTypeVarContext : new typeVarContext_1.TypeVarContext(), originalFlags, recursionCount)) {
                         return true;
                     }
                     // If the dest type is a union, only one of the subtypes needs to match.
                     let isAssignable = false;
                     if ((0, types_1.isUnion)(destType)) {
                         (0, typeUtils_1.doForEachSubtype)(destType, (destSubtype) => {
-                            if ((0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, srcType, destSubtype, diag, srcTypeVarContext, originalFlags, recursionCount)) {
+                            if ((0, constraintSolver_1.assignTypeToTypeVar)(evaluatorInterface, srcType, destSubtype, diag, srcTypeVarContext !== null && srcTypeVarContext !== void 0 ? srcTypeVarContext : new typeVarContext_1.TypeVarContext(), originalFlags, recursionCount)) {
                                 isAssignable = true;
                             }
                         });
@@ -17058,9 +17099,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (types_1.ClassType.isBuiltIn(destType, 'type') && ((_c = srcType.instantiableNestingLevel) !== null && _c !== void 0 ? _c : 0) > 0) {
                     return true;
                 }
-                if (!isSpecialFormClass(expandedSrcType, flags) &&
-                    assignClass(destType, expandedSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount, 
-                    /* reportErrorsUsingObjType */ false)) {
+                if (isSpecialFormClass(expandedSrcType, flags)) {
+                    if (destType.specialForm) {
+                        return assignType(destType.specialForm, expandedSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+                    }
+                }
+                else if (assignClass(destType, expandedSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount, 
+                /* reportErrorsUsingObjType */ false)) {
                     return true;
                 }
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.typeAssignmentMismatch().format(printSrcDestTypes(srcType, destType)));
@@ -17131,10 +17176,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                 }
                 else if (types_1.ClassType.isBuiltIn(concreteSrcType, 'LiteralString') &&
-                    strClassType &&
-                    (0, types_1.isInstantiableClass)(strClassType) &&
+                    strClass &&
+                    (0, types_1.isInstantiableClass)(strClass) &&
                     (flags & 1 /* AssignTypeFlags.EnforceInvariance */) === 0) {
-                    concreteSrcType = types_1.ClassType.cloneAsInstance(strClassType);
+                    concreteSrcType = types_1.ClassType.cloneAsInstance(strClass);
                 }
                 if (!assignClass(types_1.ClassType.cloneAsInstantiable(destType), types_1.ClassType.cloneAsInstantiable(concreteSrcType), diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount, 
                 /* reportErrorsUsingObjType */ true)) {
@@ -17149,8 +17194,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     return assignType(destCallbackType, concreteSrcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
                 }
                 // All functions are considered instances of "builtins.function".
-                if (functionObj && (0, types_1.isClassInstance)(functionObj)) {
-                    return assignType(destType, functionObj, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+                if (functionClass) {
+                    return assignType(destType, (0, typeUtils_1.convertToInstance)(functionClass), diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
                 }
             }
             else if ((0, types_1.isModule)(concreteSrcType)) {
@@ -17304,8 +17349,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         // Are we trying to assign None to a protocol?
         if ((0, typeUtils_1.isNoneInstance)(srcType) && (0, types_1.isClassInstance)(destType) && types_1.ClassType.isProtocolClass(destType)) {
-            if (noneClassType && (0, types_1.isInstantiableClass)(noneClassType)) {
-                return (0, protocols_1.assignClassToProtocol)(evaluatorInterface, types_1.ClassType.cloneAsInstantiable(destType), types_1.ClassType.cloneAsInstance(noneClassType), diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
+            if (noneTypeClass && (0, types_1.isInstantiableClass)(noneTypeClass)) {
+                return (0, protocols_1.assignClassToProtocol)(evaluatorInterface, types_1.ClassType.cloneAsInstantiable(destType), types_1.ClassType.cloneAsInstance(noneTypeClass), diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount);
             }
         }
         if ((0, typeUtils_1.isNoneInstance)(destType)) {
@@ -17732,8 +17777,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 for (const field of types_1.ClassType.getSymbolTable(mroClass)) {
                     if (field[0] !== '__call__' && !field[1].isIgnoredForProtocolMatch()) {
                         let fieldIsPartOfFunction = false;
-                        if (functionObj && (0, types_1.isClass)(functionObj)) {
-                            if (types_1.ClassType.getSymbolTable(functionObj).has(field[0])) {
+                        if (functionClass && (0, types_1.isClass)(functionClass)) {
+                            if (types_1.ClassType.getSymbolTable(functionClass).has(field[0])) {
                                 fieldIsPartOfFunction = true;
                             }
                         }
@@ -17818,7 +17863,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let srcLastToPackIndex = srcDetails.params.findIndex((p, i) => {
             (0, debug_1.assert)(destDetails.argsIndex !== undefined);
-            return i >= destDetails.argsIndex && p.source === parameterUtils_1.ParameterSource.KeywordOnly;
+            return i >= destDetails.argsIndex && p.kind === parameterUtils_1.ParameterKind.Keyword;
         });
         if (srcLastToPackIndex < 0) {
             srcLastToPackIndex = srcDetails.params.length;
@@ -17866,7 +17911,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     },
                     type: srcPositionalsType,
                     index: -1,
-                    source: parameterUtils_1.ParameterSource.PositionOnly,
+                    kind: parameterUtils_1.ParameterKind.Positional,
                 },
                 ...srcDetails.params.slice(destDetails.argsIndex + srcPositionalsToPack.length, srcDetails.params.length),
             ];
@@ -17874,15 +17919,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             srcDetails.argsIndex = argsIndex >= 0 ? argsIndex : undefined;
             const kwargsIndex = srcDetails.params.findIndex((param) => param.param.category === 2 /* ParameterCategory.KwargsDict */);
             srcDetails.kwargsIndex = kwargsIndex >= 0 ? kwargsIndex : undefined;
-            const firstKeywordOnlyIndex = srcDetails.params.findIndex((param) => param.source === parameterUtils_1.ParameterSource.KeywordOnly);
+            const firstKeywordOnlyIndex = srcDetails.params.findIndex((param) => param.kind === parameterUtils_1.ParameterKind.Keyword);
             srcDetails.firstKeywordOnlyIndex = firstKeywordOnlyIndex >= 0 ? firstKeywordOnlyIndex : undefined;
-            srcDetails.positionOnlyParamCount = Math.max(0, srcDetails.params.findIndex((p) => p.source !== parameterUtils_1.ParameterSource.PositionOnly ||
+            srcDetails.positionOnlyParamCount = Math.max(0, srcDetails.params.findIndex((p) => p.kind !== parameterUtils_1.ParameterKind.Positional ||
                 p.param.category !== 0 /* ParameterCategory.Simple */ ||
                 p.param.hasDefault));
         }
     }
     function assignFunction(destType, srcType, diag, destTypeVarContext, srcTypeVarContext, flags, recursionCount) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let canAssign = true;
         const checkReturnType = (flags & 64 /* AssignTypeFlags.SkipFunctionReturnTypeCheck */) === 0;
         const reverseMatching = (flags & 2 /* AssignTypeFlags.ReverseTypeVarMatching */) !== 0;
@@ -17918,11 +17963,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             const destParamName = (_c = destParam.param.name) !== null && _c !== void 0 ? _c : '';
             const srcParamName = (_d = srcParam.param.name) !== null && _d !== void 0 ? _d : '';
             if (destParamName) {
-                const isDestPositionalOnly = destParam.source === parameterUtils_1.ParameterSource.PositionOnly;
+                const isDestPositionalOnly = destParam.kind === parameterUtils_1.ParameterKind.Positional;
                 if (!isDestPositionalOnly &&
                     destParam.param.category !== 1 /* ParameterCategory.ArgsList */ &&
                     srcParam.param.category !== 1 /* ParameterCategory.ArgsList */) {
-                    if (srcParam.source === parameterUtils_1.ParameterSource.PositionOnly) {
+                    if (srcParam.kind === parameterUtils_1.ParameterKind.Positional) {
                         diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionParamPositionOnly().format({
                             name: destParamName,
                         }));
@@ -17968,10 +18013,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     canAssign = false;
                 }
             }
-            else if (destParam.source !== parameterUtils_1.ParameterSource.PositionOnly &&
-                srcParam.source === parameterUtils_1.ParameterSource.PositionOnly &&
+            else if (destParam.kind !== parameterUtils_1.ParameterKind.Positional &&
+                srcParam.kind === parameterUtils_1.ParameterKind.Positional &&
                 srcParamDetails.kwargsIndex === undefined &&
-                !srcParamDetails.params.some((p) => p.source === parameterUtils_1.ParameterSource.KeywordOnly &&
+                !srcParamDetails.params.some((p) => p.kind === parameterUtils_1.ParameterKind.Keyword &&
                     p.param.category === 0 /* ParameterCategory.Simple */ &&
                     p.param.name === destParam.param.name)) {
                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.namedParamMissingInSource().format({
@@ -17989,36 +18034,50 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }));
             canAssign = false;
         }
-        if (destPositionalCount < srcPositionalCount) {
-            // If the dest type includes a ParamSpec, the additional parameters
-            // can be assigned to it, so no need to report an error here.
-            if (!targetIncludesParamSpec) {
-                const nonDefaultSrcParamCount = srcParamDetails.params.filter((p) => !!p.param.name && !p.param.hasDefault && p.param.category === 0 /* ParameterCategory.Simple */).length;
-                if (destParamDetails.argsIndex === undefined) {
-                    if (destPositionalCount < nonDefaultSrcParamCount) {
-                        if (destParamDetails.firstPositionOrKeywordIndex > 0 &&
-                            destParamDetails.firstPositionOrKeywordIndex < srcPositionalCount) {
-                            diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionTooFewParams().format({
-                                expected: nonDefaultSrcParamCount,
-                                received: destPositionalCount,
-                            }));
-                            canAssign = false;
-                        }
+        if (destPositionalCount < srcPositionalCount && !targetIncludesParamSpec) {
+            for (let i = destPositionalCount; i < srcPositionalCount; i++) {
+                // If the dest has an *args parameter, make sure it can accept the remaining
+                // positional arguments in the source.
+                if (destParamDetails.argsIndex !== undefined) {
+                    const destArgsType = destParamDetails.params[destParamDetails.argsIndex].type;
+                    const srcParamType = srcParamDetails.params[i].type;
+                    if (!assignFunctionParameter(destArgsType, srcParamType, i, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                        canAssign = false;
                     }
+                    continue;
                 }
-                else {
-                    // Make sure the remaining positional arguments are of the
-                    // correct type for the *args parameter.
-                    const destArgsType = destParamDetails.params[destParamDetails.argsIndex].type;
-                    if (!(0, types_1.isAnyOrUnknown)(destArgsType)) {
-                        for (let paramIndex = destPositionalCount; paramIndex < srcPositionalCount; paramIndex++) {
-                            const srcParamType = srcParamDetails.params[paramIndex].type;
-                            if (!assignFunctionParameter(destArgsType, srcParamType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
-                                canAssign = false;
-                            }
-                        }
+                // If The source parameter has a default value, it is OK for the
+                // corresponding dest parameter to be missing.
+                const srcParam = srcParamDetails.params[i];
+                if (srcParam.param.hasDefault) {
+                    // Assign default arg value in case it is needed for
+                    // populating TypeVar constraints.
+                    const paramInfo = srcParamDetails.params[i];
+                    const defaultArgType = (_f = paramInfo.defaultArgType) !== null && _f !== void 0 ? _f : paramInfo.param.defaultType;
+                    if (defaultArgType &&
+                        !assignType(paramInfo.type, defaultArgType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), srcTypeVarContext, 
+                        /* destTypeVarContext */ undefined, flags, recursionCount)) {
+                        canAssign = false;
                     }
+                    continue;
+                }
+                // If the source parameter is also addressible by keyword, it is OK
+                // that there is no matching positional parameter in the dest.
+                if (srcParam.kind === parameterUtils_1.ParameterKind.Standard) {
+                    continue;
+                }
+                // If the source parameter is a variadic, it is OK that there is no
+                // matching positional parameter in the dest.
+                if (srcParam.param.category === 1 /* ParameterCategory.ArgsList */) {
+                    continue;
                 }
+                const nonDefaultSrcParamCount = srcParamDetails.params.filter((p) => !!p.param.name && !p.param.hasDefault && p.param.category === 0 /* ParameterCategory.Simple */).length;
+                diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.functionTooFewParams().format({
+                    expected: nonDefaultSrcParamCount,
+                    received: destPositionalCount,
+                }));
+                canAssign = false;
+                break;
             }
         }
         else if (srcPositionalCount < destPositionalCount) {
@@ -18039,10 +18098,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         if (!assignFunctionParameter(destParamType, srcArgsType, paramIndex, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                             canAssign = false;
                         }
-                        if (destParamDetails.params[paramIndex].source !== parameterUtils_1.ParameterSource.PositionOnly &&
+                        if (destParamDetails.params[paramIndex].kind !== parameterUtils_1.ParameterKind.Positional &&
                             srcParamDetails.kwargsIndex === undefined) {
                             diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.namedParamMissingInSource().format({
-                                name: (_f = destParamDetails.params[paramIndex].param.name) !== null && _f !== void 0 ? _f : '',
+                                name: (_g = destParamDetails.params[paramIndex].param.name) !== null && _g !== void 0 ? _g : '',
                             }));
                             canAssign = false;
                         }
@@ -18090,7 +18149,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             destParamDetails.argsIndex !== undefined &&
             !destParamDetails.hasUnpackedVariadicTypeVar) {
             diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(localize_1.LocAddendum.argsParamMissing().format({
-                paramName: (_g = destParamDetails.params[destParamDetails.argsIndex].param.name) !== null && _g !== void 0 ? _g : '',
+                paramName: (_h = destParamDetails.params[destParamDetails.argsIndex].param.name) !== null && _h !== void 0 ? _h : '',
             }));
             canAssign = false;
         }
@@ -18117,16 +18176,17 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             if (srcStartOfNamed >= 0) {
                 srcParamDetails.params.forEach((srcParamInfo, index) => {
+                    var _a;
                     if (index >= srcStartOfNamed) {
                         if (srcParamInfo.param.name &&
                             srcParamInfo.param.category === 0 /* ParameterCategory.Simple */ &&
-                            srcParamInfo.source !== parameterUtils_1.ParameterSource.PositionOnly) {
+                            srcParamInfo.kind !== parameterUtils_1.ParameterKind.Positional) {
                             const destParamInfo = destParamMap.get(srcParamInfo.param.name);
                             const paramDiag = diag === null || diag === void 0 ? void 0 : diag.createAddendum();
                             const srcParamType = srcParamInfo.type;
                             if (!destParamInfo) {
                                 if (destParamDetails.kwargsIndex === undefined && !srcParamInfo.param.hasDefault) {
-                                    if (paramDiag && srcParamDetails.firstKeywordOnlyIndex !== undefined) {
+                                    if (paramDiag) {
                                         paramDiag.addMessage(localize_1.LocAddendum.namedParamMissingInDest().format({
                                             name: srcParamInfo.param.name,
                                         }));
@@ -18139,6 +18199,16 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                                         canAssign = false;
                                     }
                                 }
+                                else if (srcParamInfo.param.hasDefault) {
+                                    // Assign default arg values in case they are needed for
+                                    // populating TypeVar constraints.
+                                    const defaultArgType = (_a = srcParamInfo.defaultArgType) !== null && _a !== void 0 ? _a : srcParamInfo.param.defaultType;
+                                    if (defaultArgType &&
+                                        !assignType(srcParamInfo.type, defaultArgType, diag === null || diag === void 0 ? void 0 : diag.createAddendum(), srcTypeVarContext, 
+                                        /* destTypeVarContext */ undefined, flags, recursionCount)) {
+                                        canAssign = false;
+                                    }
+                                }
                             }
                             else {
                                 const destParamType = destParamInfo.type;
@@ -18203,7 +18273,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         // If the source and the dest are using the same ParamSpec, any additional
         // concatenated parameters must match.
         if (targetIncludesParamSpec &&
-            ((_h = srcType.details.paramSpec) === null || _h === void 0 ? void 0 : _h.nameWithScope) === ((_j = destType.details.paramSpec) === null || _j === void 0 ? void 0 : _j.nameWithScope)) {
+            ((_j = srcType.details.paramSpec) === null || _j === void 0 ? void 0 : _j.nameWithScope) === ((_k = destType.details.paramSpec) === null || _k === void 0 ? void 0 : _k.nameWithScope)) {
             if (srcParamDetails.params.length !== destParamDetails.params.length) {
                 canAssign = false;
             }
@@ -18314,9 +18384,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     // type at runtime.
                     if ((0, types_1.isClassInstance)(srcReturnType) &&
                         types_1.ClassType.isBuiltIn(srcReturnType, ['TypeGuard', 'TypeIs']) &&
-                        boolClassType &&
-                        (0, types_1.isInstantiableClass)(boolClassType)) {
-                        if (assignType(destReturnType, types_1.ClassType.cloneAsInstance(boolClassType), returnDiag === null || returnDiag === void 0 ? void 0 : returnDiag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
+                        boolClass &&
+                        (0, types_1.isInstantiableClass)(boolClass)) {
+                        if (assignType(destReturnType, types_1.ClassType.cloneAsInstance(boolClass), returnDiag === null || returnDiag === void 0 ? void 0 : returnDiag.createAddendum(), destTypeVarContext, srcTypeVarContext, flags, recursionCount)) {
                             isReturnTypeCompatible = true;
                         }
                     }
@@ -18364,7 +18434,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         replacedTypeArg = true;
                         return expectedTypeArgType;
                     }
-                    else if ((0, types_1.isClassInstance)(expectedTypeArgType) && (0, types_1.isClassInstance)(typeArg)) {
+                    if ((0, types_1.isClassInstance)(expectedTypeArgType) && (0, types_1.isClassInstance)(typeArg)) {
                         // Recursively replace Any in the type argument.
                         const recursiveReplacement = replaceTypeArgsWithAny(node, expectedTypeArgType, typeArg, recursionCount);
                         if (recursiveReplacement) {
@@ -18404,6 +18474,11 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // When a value is assigned to a variable with a declared type,
     // we may be able to narrow the type based on the assignment.
     function narrowTypeBasedOnAssignment(node, declaredType, assignedType) {
+        // TODO: The rules for narrowing types on assignment are defined in
+        // the typing spec. Pyright's current logic is currently not even internally
+        // consistent and probably not sound from a type theory perspective. It
+        // should be completely reworked once there has been a public discussion
+        // about the correct behavior.
         const narrowedType = (0, typeUtils_1.mapSubtypes)(assignedType, (assignedSubtype) => {
             // Handle the special case where the assigned type is a literal type.
             // Some types include very large unions of literal types, and we don't
@@ -18438,8 +18513,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                         return declaredSubtype;
                     }
                     // If the declared type doesn't contain any `Any` but the assigned
-                    // type does, stick with the declared type.
-                    if ((0, typeUtils_1.containsAnyRecursive)(assignedSubtype) && !(0, typeUtils_1.containsAnyRecursive)(declaredSubtype)) {
+                    // type does, stick with the declared type. We don't include unknowns
+                    // in the assigned subtype check here so unknowns are preserved so
+                    // reportUnknownVariableType assignment diagnostics are reported.
+                    // TODO - this is an inconsistency because Any and Unknown should
+                    // always be treated the same for purposes of type narrowing. This
+                    // should be revisited once the narrowing-on-assignment behavior
+                    // is properly specified in the typing spec.
+                    if ((0, typeUtils_1.containsAnyRecursive)(assignedSubtype, /* includeUnknown */ false) &&
+                        !(0, typeUtils_1.containsAnyRecursive)(declaredSubtype)) {
                         return declaredSubtype;
                     }
                     return assignedSubtype;
@@ -18673,13 +18755,13 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const overrideParam = overrideParamDetails.params[i].param;
                 if (i >= baseParamDetails.positionOnlyParamCount &&
                     !(0, symbolNameUtils_1.isPrivateOrProtectedName)(baseParam.name || '') &&
-                    baseParamDetails.params[i].source !== parameterUtils_1.ParameterSource.PositionOnly &&
+                    baseParamDetails.params[i].kind !== parameterUtils_1.ParameterKind.Positional &&
                     baseParam.category === 0 /* ParameterCategory.Simple */ &&
                     enforceParamNames &&
                     baseParam.name !== overrideParam.name) {
                     if (overrideParam.category === 0 /* ParameterCategory.Simple */) {
                         if (!baseParam.isNameSynthesized) {
-                            if (overrideParamDetails.params[i].source === parameterUtils_1.ParameterSource.PositionOnly) {
+                            if (overrideParamDetails.params[i].kind === parameterUtils_1.ParameterKind.Positional) {
                                 diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.overrideParamNamePositionOnly().format({
                                     index: i + 1,
                                     baseName: baseParam.name || '*',
@@ -18698,8 +18780,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 else if (i < overrideParamDetails.positionOnlyParamCount &&
                     i >= baseParamDetails.positionOnlyParamCount) {
-                    if (!baseParam.isNameSynthesized &&
-                        baseParamDetails.params[i].source !== parameterUtils_1.ParameterSource.PositionOnly) {
+                    if (!baseParam.isNameSynthesized && baseParamDetails.params[i].kind !== parameterUtils_1.ParameterKind.Positional) {
                         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.overrideParamNamePositionOnly().format({
                             index: i + 1,
                             baseName: baseParam.name || '*',
@@ -18737,7 +18818,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (enforceParamNames && overrideParamDetails.kwargsIndex === undefined) {
                 for (let i = positionalParamCount; i < baseParamDetails.positionParamCount; i++) {
                     const baseParam = baseParamDetails.params[i];
-                    if (baseParam.source === parameterUtils_1.ParameterSource.PositionOrKeyword &&
+                    if (baseParam.kind === parameterUtils_1.ParameterKind.Standard &&
                         baseParam.param.category === 0 /* ParameterCategory.Simple */) {
                         diag === null || diag === void 0 ? void 0 : diag.addMessage(localize_1.LocAddendum.overrideParamNamePositionOnly().format({
                             index: i + 1,
@@ -18770,10 +18851,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
             }
             // Now check any keyword-only parameters.
-            const baseKwOnlyParams = baseParamDetails.params.filter((paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly &&
-                paramInfo.param.category === 0 /* ParameterCategory.Simple */);
-            const overrideKwOnlyParams = overrideParamDetails.params.filter((paramInfo) => paramInfo.source === parameterUtils_1.ParameterSource.KeywordOnly &&
-                paramInfo.param.category === 0 /* ParameterCategory.Simple */);
+            const baseKwOnlyParams = baseParamDetails.params.filter((paramInfo) => paramInfo.kind === parameterUtils_1.ParameterKind.Keyword && paramInfo.param.category === 0 /* ParameterCategory.Simple */);
+            const overrideKwOnlyParams = overrideParamDetails.params.filter((paramInfo) => paramInfo.kind === parameterUtils_1.ParameterKind.Keyword && paramInfo.param.category === 0 /* ParameterCategory.Simple */);
             baseKwOnlyParams.forEach((paramInfo) => {
                 var _a, _b, _c;
                 const overrideParamInfo = overrideKwOnlyParams.find((pi) => paramInfo.param.name === pi.param.name);
@@ -19115,21 +19194,21 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             case 56 /* ParseNodeType.Unpack */:
             case 52 /* ParseNodeType.Tuple */:
             case 9 /* ParseNodeType.Call */:
-            case 32 /* ParseNodeType.ListComprehension */:
+            case 11 /* ParseNodeType.Comprehension */:
             case 46 /* ParseNodeType.Slice */:
             case 60 /* ParseNodeType.Yield */:
             case 61 /* ParseNodeType.YieldFrom */:
-            case 30 /* ParseNodeType.Lambda */:
+            case 33 /* ParseNodeType.Lambda */:
             case 40 /* ParseNodeType.Number */:
-            case 15 /* ParseNodeType.Dictionary */:
-            case 31 /* ParseNodeType.List */:
+            case 18 /* ParseNodeType.Dictionary */:
+            case 34 /* ParseNodeType.List */:
             case 45 /* ParseNodeType.Set */:
                 return false;
             case 7 /* ParseNodeType.BinaryOperation */:
                 return (node.operator === 6 /* OperatorType.BitwiseOr */ &&
                     isLegalTypeAliasExpressionForm(node.leftExpression) &&
                     isLegalTypeAliasExpressionForm(node.rightExpression));
-            case 24 /* ParseNodeType.Index */:
+            case 27 /* ParseNodeType.Index */:
                 return isLegalTypeAliasExpressionForm(node.baseExpression);
             case 35 /* ParseNodeType.MemberAccess */:
                 return isLegalTypeAliasExpressionForm(node.leftExpression);