@zzzen/pyright-internal 1.2.0-dev.20240526 → 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();
@@ -546,7 +537,7 @@ 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) &&
@@ -605,7 +596,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = getTypeOfMemberAccess(node, flags);
                 break;
             }
-            case 24 /* ParseNodeType.Index */: {
+            case 27 /* ParseNodeType.Index */: {
                 typeResult = getTypeOfIndex(node, flags);
                 break;
             }
@@ -617,7 +608,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = getTypeOfTuple(node, flags, inferenceContext, signatureTracker);
                 break;
             }
-            case 11 /* ParseNodeType.Constant */: {
+            case 14 /* ParseNodeType.Constant */: {
                 typeResult = getTypeOfConstant(node, flags);
                 break;
             }
@@ -635,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;
             }
@@ -657,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;
@@ -674,15 +665,15 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 typeResult = (0, operations_1.getTypeOfTernaryOperation)(evaluatorInterface, node, flags, inferenceContext);
                 break;
             }
-            case 32 /* ParseNodeType.ListComprehension */: {
-                typeResult = getTypeOfListComprehension(node, flags, 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;
             }
@@ -724,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;
             }
@@ -946,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)) {
@@ -974,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.
@@ -1040,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));
                         }
@@ -1733,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__');
@@ -1786,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)) {
@@ -1852,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);
@@ -1882,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;
                                 });
@@ -1983,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;
@@ -2022,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 */) {
@@ -2099,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')) {
@@ -2419,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++) {
@@ -2453,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);
@@ -2470,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),
@@ -2493,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),
@@ -2542,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();
@@ -2575,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
@@ -2619,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 }]);
             }
@@ -2774,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',
@@ -2785,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;
@@ -2912,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 */);
@@ -3162,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) {
@@ -3236,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) {
@@ -3256,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 */);
                         }
@@ -3327,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);
                 }
@@ -3367,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;
@@ -3731,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) {
@@ -3774,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;
             }
@@ -4008,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;
                 }
@@ -4392,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(),
             },
         });
@@ -4901,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);
@@ -5059,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();
     }
@@ -5371,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;
         };
@@ -5415,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 */ |
@@ -5425,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) => {
@@ -5436,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) {
@@ -5525,7 +5492,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         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.
@@ -5545,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;
             }
@@ -5641,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 {
@@ -5748,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
@@ -5882,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;
@@ -6058,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();
@@ -6102,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),
                     };
                 }
             }
@@ -7063,7 +7028,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 // 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) {
@@ -7592,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])) {
@@ -8252,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.
@@ -8267,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);
@@ -8990,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,
@@ -9125,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;
             }
@@ -9179,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;
         }
@@ -9264,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)) {
@@ -9275,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 */ ||
@@ -9346,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;
@@ -9569,9 +9537,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 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 */) {
+            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;
@@ -9633,11 +9601,11 @@ 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));
                     }
                 }
@@ -9661,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) => {
@@ -9678,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) {
@@ -9706,8 +9673,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     }
                 }
             }
-            else if (entryNode.nodeType === 32 /* ParseNodeType.ListComprehension */) {
-                const dictEntryTypeResult = getElementTypeFromListComprehension(entryNode, flags, 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;
@@ -9717,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] });
@@ -9739,7 +9706,7 @@ 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());
@@ -9789,7 +9756,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     // 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, flags, inferenceContext) {
-        const builtInClassName = node.nodeType === 31 /* ParseNodeType.List */ ? 'list' : 'set';
+        const builtInClassName = node.nodeType === 34 /* ParseNodeType.List */ ? 'list' : 'set';
         inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
         let isIncomplete = false;
         let typeErrors = false;
@@ -9802,8 +9769,8 @@ 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, flags, expectedEntryType);
+            if (entry.nodeType === 11 /* ParseNodeType.Comprehension */) {
+                entryTypeResult = getElementTypeFromComprehension(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, expectedEntryType);
             }
             else {
                 entryTypeResult = getTypeOfExpression(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(expectedEntryType));
@@ -9861,7 +9828,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
     }
     // Attempts to infer the type of a list or set statement with no "expected type".
     function getTypeOfListOrSetInferred(node, flags, hasExpectedType) {
-        const builtInClassName = node.nodeType === 31 /* ParseNodeType.List */ ? 'list' : 'set';
+        const builtInClassName = node.nodeType === 34 /* ParseNodeType.List */ ? 'list' : 'set';
         const verifyHashable = node.nodeType === 45 /* ParseNodeType.Set */;
         let isEmptyContainer = false;
         let isIncomplete = false;
@@ -9869,8 +9836,8 @@ 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, flags);
+            if (entry.nodeType === 11 /* ParseNodeType.Comprehension */ && !entry.isGenerator) {
+                entryTypeResult = getElementTypeFromComprehension(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */);
             }
             else {
                 entryTypeResult = getTypeOfExpression(entry, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */);
@@ -10189,14 +10156,14 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         return { type: functionType, isIncomplete, typeErrors };
     }
-    function getTypeOfListComprehension(node, flags, 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);
@@ -10207,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, flags, expectedEntryType);
+        const elementTypeResult = getElementTypeFromComprehension(node, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, expectedEntryType);
         if (elementTypeResult.isIncomplete) {
             isIncomplete = true;
         }
@@ -10251,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;
@@ -10265,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.
@@ -10275,21 +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, flags, 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 | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(expectedKeyType));
+            const keyTypeResult = getTypeOfExpression(node.expression.keyExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedKeyType));
             if (keyTypeResult.isIncomplete) {
                 isIncomplete = true;
             }
@@ -10300,7 +10266,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             if (!expectedKeyType || !(0, typeUtils_1.containsLiteralType)(expectedKeyType)) {
                 keyType = stripLiteralValue(keyType);
             }
-            const valueTypeResult = getTypeOfExpression(node.expression.valueExpression, flags | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
+            const valueTypeResult = getTypeOfExpression(node.expression.valueExpression, flags, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
             if (valueTypeResult.isIncomplete) {
                 isIncomplete = true;
             }
@@ -10316,12 +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 | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (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 | 268435456 /* EvaluatorFlags.StripLiteralTypeForTuple */, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
+            const exprTypeResult = getTypeOfExpression(node.expression, flags, (0, typeUtils_1.makeInferenceContext)(expectedValueOrElementType));
             if (exprTypeResult.isIncomplete) {
                 isIncomplete = true;
             }
@@ -10539,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;
     }
@@ -10601,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);
                 }
@@ -10609,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 */) {
@@ -10653,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;
     }
@@ -11048,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,
             })) {
@@ -11059,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));
@@ -11072,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]].
@@ -11093,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;
     }
@@ -11321,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 */);
@@ -11599,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) {
@@ -11861,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 */;
@@ -12216,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;
@@ -12245,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.
@@ -12303,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) {
@@ -12536,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) {
@@ -12963,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) {
@@ -13529,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) {
@@ -13721,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,
@@ -13751,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;
             }
@@ -13759,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;
             }
@@ -13771,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 */);
@@ -13807,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,
@@ -13843,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;
                 }
@@ -13875,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;
                     }
@@ -13883,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 */;
@@ -13903,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 {
@@ -13938,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;
             }
@@ -13957,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;
@@ -14023,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);
@@ -14063,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) {
@@ -14101,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;
                 }
@@ -14121,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;
                             }
@@ -14139,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;
                 }
@@ -14371,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)) {
@@ -14710,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) {
@@ -14914,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;
@@ -15145,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) {
@@ -15313,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 {
@@ -16158,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();
     }
@@ -16235,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);
                 }
             }
@@ -16477,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) => {
@@ -16501,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
@@ -16966,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;
                             }
                         });
@@ -17209,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)) {
@@ -17227,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)) {
@@ -17382,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)) {
@@ -17810,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;
                             }
                         }
@@ -18417,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;
                         }
                     }
@@ -18467,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) {
@@ -18507,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
@@ -18541,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;
@@ -19215,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);