Version 2.19.0-403.0.dev

Merge 3207808 into dev

DEPS

@@ -51,7 +51,7 @@ vars = {
 
   # co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
   # hashes.
-  "co19_rev": "36cc25de009198a8516be7f12ac5b61069656d09",
+  "co19_rev": "19439c0d58a0df422c4acc4ae97a3deeb98d0f67",
   # This line prevents conflicts when both packages are rolled simultaneously.
   "co19_2_rev": "cdab7e4e26f3dd534bcb297ff3f9e9aa5c7a04fb",
 

pkg/front_end/lib/src/fasta/kernel/hierarchy/hierarchy_builder.dart

@@ -78,6 +78,7 @@ class ClassHierarchyBuilder implements ClassHierarchyBase {
 
   @override
   Supertype? getClassAsInstanceOf(Class subclass, Class superclass) {
+    if (identical(subclass, superclass)) return subclass.asThisSupertype;
     ClassHierarchyNode clsNode = getNodeFromClass(subclass);
     ClassHierarchyNode supertypeNode = getNodeFromClass(superclass);
     List<Supertype> superclasses = clsNode.superclasses;
@@ -114,6 +115,11 @@ class ClassHierarchyBuilder implements ClassHierarchyBase {
     return asSupertypeOf(type, superclass)?.typeArguments;
   }
 
+  @override
+  bool isSubtypeOf(Class subtype, Class superclass) {
+    return getClassAsInstanceOf(subtype, superclass) != null;
+  }
+
   @override
   InterfaceType getLegacyLeastUpperBound(
       InterfaceType type1, InterfaceType type2, Library clientLibrary) {

pkg/front_end/lib/src/fasta/kernel/hierarchy/members_builder.dart

@@ -148,6 +148,18 @@ class ClassMembersBuilder implements ClassHierarchyMembers {
     return getNodeFromClass(cls).getInterfaceMember(name, setter);
   }
 
+  @override
+  Member? getDispatchTarget(Class cls, Name name, {bool setter = false}) {
+    return getNodeFromClass(cls)
+        .getDispatchTarget(name, setter)
+        ?.getMember(this);
+  }
+
+  ClassMember? getDispatchClassMember(Class cls, Name name,
+      {bool setter = false}) {
+    return getNodeFromClass(cls).getDispatchTarget(name, setter);
+  }
+
   static ClassMembersBuilder build(
       ClassHierarchyBuilder hierarchyBuilder, List<ClassBuilder> classes) {
     ClassMembersBuilder membersBuilder =

pkg/front_end/lib/src/fasta/kernel/hierarchy/members_node.dart

@@ -74,14 +74,6 @@ class ClassMembersNodeBuilder {
   bool get shouldModifyKernel =>
       classBuilder.libraryBuilder.loader == hierarchy.loader;
 
-  ClassMember? checkInheritanceConflict(ClassMember a, ClassMember b) {
-    if (a.isStatic || a.isProperty != b.isProperty) {
-      reportInheritanceConflict(a, b);
-      return a;
-    }
-    return null;
-  }
-
   static void inferMethodType(
       ClassHierarchyBuilder hierarchyBuilder,
       ClassMembersBuilder membersBuilder,
@@ -2311,6 +2303,7 @@ class ClassMembersNodeBuilder {
 
     return new ClassMembersNode(
         classBuilder,
+        supernode,
         classMemberMap,
         classSetterMap,
         interfaceMemberMap,
@@ -2360,6 +2353,8 @@ class ClassMembersNodeBuilder {
 class ClassMembersNode {
   final ClassBuilder classBuilder;
 
+  final ClassMembersNode? supernode;
+
   /// All the members of this class including [classMembers] of its
   /// superclasses. The members are sorted by [compareDeclarations].
   final Map<Name, ClassMember> classMemberMap;
@@ -2387,6 +2382,7 @@ class ClassMembersNode {
 
   ClassMembersNode(
       this.classBuilder,
+      this.supernode,
       this.classMemberMap,
       this.classSetterMap,
       this.interfaceMemberMap,
@@ -2434,9 +2430,16 @@ class ClassMembersNode {
   }
 
   ClassMember? getInterfaceMember(Name name, bool isSetter) {
-    return isSetter
+    ClassMember? result = isSetter
         ? (interfaceSetterMap ?? classSetterMap)[name]
         : (interfaceMemberMap ?? classMemberMap)[name];
+    if (result == null) {
+      return null;
+    }
+    if (result.isStatic) {
+      return null;
+    }
+    return result;
   }
 
   ClassMember? findMember(Name name, List<ClassMember> declarations) {
@@ -2464,7 +2467,17 @@ class ClassMembersNode {
   }
 
   ClassMember? getDispatchTarget(Name name, bool isSetter) {
-    return isSetter ? classSetterMap[name] : classMemberMap[name];
+    ClassMember? result =
+        isSetter ? classSetterMap[name] : classMemberMap[name];
+    if (result == null) {
+      return null;
+    }
+    if (result.isStatic) {
+      // TODO(johnniwinther): Can we avoid putting static members in the
+      // [classMemberMap]/[classSetterMap] maps?
+      return supernode?.getDispatchTarget(name, isSetter);
+    }
+    return result;
   }
 }
 

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -12,7 +12,8 @@ import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
 import 'package:_fe_analyzer_shared/src/util/resolve_relative_uri.dart'
     show resolveRelativeUri;
 import 'package:kernel/ast.dart' hide Combinator, MapLiteralEntry;
-import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
+import 'package:kernel/class_hierarchy.dart'
+    show ClassHierarchy, ClassHierarchyBase, ClassHierarchyMembers;
 import 'package:kernel/clone.dart' show CloneVisitorNotMembers;
 import 'package:kernel/reference_from_index.dart'
     show IndexedClass, IndexedContainer, IndexedLibrary;
@@ -4416,7 +4417,8 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   void checkBoundsInMethodInvocation(
       DartType receiverType,
       TypeEnvironment typeEnvironment,
-      ClassHierarchy hierarchy,
+      ClassHierarchyBase classHierarchy,
+      ClassHierarchyMembers membersHierarchy,
       Name name,
       Member? interfaceTarget,
       Arguments arguments,
@@ -4437,14 +4439,14 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
     }
     // TODO(cstefantsova): Find a better way than relying on [interfaceTarget].
     Member? method =
-        hierarchy.getDispatchTarget(klass, name) ?? interfaceTarget;
+        membersHierarchy.getDispatchTarget(klass, name) ?? interfaceTarget;
     // ignore: unnecessary_null_comparison
     if (method == null || method is! Procedure) {
       return;
     }
     if (klass != method.enclosingClass) {
       Supertype parent =
-          hierarchy.getClassAsInstanceOf(klass, method.enclosingClass!)!;
+          classHierarchy.getClassAsInstanceOf(klass, method.enclosingClass!)!;
       klass = method.enclosingClass!;
       receiverTypeArguments = parent.typeArguments;
       Map<TypeParameter, DartType> instanceSubstitutionMap = substitutionMap;
@@ -4492,7 +4494,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
 
   void checkBoundsInFunctionInvocation(
       TypeEnvironment typeEnvironment,
-      ClassHierarchy hierarchy,
       FunctionType functionType,
       String? localName,
       Arguments arguments,
@@ -4526,7 +4527,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
 
   void checkBoundsInInstantiation(
       TypeEnvironment typeEnvironment,
-      ClassHierarchy hierarchy,
       FunctionType functionType,
       List<DartType> typeArguments,
       Uri fileUri,

pkg/front_end/lib/src/fasta/source/source_loader.dart

@@ -2295,21 +2295,25 @@ severity: $severity
           Name name = restrictedMemberNames[i];
           Class? declarer = restrictedMemberDeclarers[i];
 
-          Member? member = hierarchy.getDispatchTarget(classBuilder.cls, name);
-          if (member?.enclosingClass != declarer &&
-              member?.enclosingClass != classBuilder.cls &&
-              member?.isAbstract == false) {
-            classBuilder.libraryBuilder.addProblem(
-                templateEnumInheritsRestricted.withArguments(name.text),
-                classBuilder.charOffset,
-                classBuilder.name.length,
-                classBuilder.fileUri,
-                context: <LocatedMessage>[
-                  messageEnumInheritsRestrictedMember.withLocation(
-                      member!.fileUri,
-                      member.fileOffset,
-                      member.name.text.length)
-                ]);
+          ClassMember? classMember =
+              membersBuilder.getDispatchClassMember(classBuilder.cls, name);
+          if (classMember != null) {
+            Member member = classMember.getMember(membersBuilder);
+            if (member.enclosingClass != declarer &&
+                member.enclosingClass != classBuilder.cls &&
+                member.isAbstract == false) {
+              classBuilder.libraryBuilder.addProblem(
+                  templateEnumInheritsRestricted.withArguments(name.text),
+                  classBuilder.charOffset,
+                  classBuilder.name.length,
+                  classBuilder.fileUri,
+                  context: <LocatedMessage>[
+                    messageEnumInheritsRestrictedMember.withLocation(
+                        classMember.fileUri,
+                        classMember.charOffset,
+                        member.name.text.length)
+                  ]);
+            }
           }
         }
       }

pkg/front_end/lib/src/fasta/type_inference/inference_visitor.dart

@@ -1407,7 +1407,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
     if (inferredExpressionType is InterfaceType) {
       // TODO(johnniwinther): Should we use the type of
       //  `iterable.iterator.current` instead?
-      List<DartType>? supertypeArguments = classHierarchy
+      List<DartType>? supertypeArguments = hierarchyBuilder
           .getTypeArgumentsAsInstanceOf(inferredExpressionType, iterableClass);
       if (supertypeArguments != null) {
         inferredType = supertypeArguments[0];
@@ -1636,7 +1636,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
   InitializerInferenceResult visitInvalidSuperInitializerJudgment(
       InvalidSuperInitializerJudgment node) {
     Substitution substitution = Substitution.fromSupertype(
-        classHierarchy.getClassAsInstanceOf(
+        hierarchyBuilder.getClassAsInstanceOf(
             thisType!.classNode, node.target.enclosingClass)!);
     FunctionType functionType = replaceReturnType(
         substitution.substituteType(node.target.function
@@ -2843,10 +2843,10 @@ class InferenceVisitorImpl extends InferenceVisitorBase
     // Ambiguous set/map literal
     if (unfuturedTypeContext is InterfaceType) {
       typeContextIsMap = typeContextIsMap ||
-          classHierarchy.isSubtypeOf(
+          hierarchyBuilder.isSubtypeOf(
               unfuturedTypeContext.classNode, coreTypes.mapClass);
       typeContextIsIterable = typeContextIsIterable ||
-          classHierarchy.isSubtypeOf(
+          hierarchyBuilder.isSubtypeOf(
               unfuturedTypeContext.classNode, coreTypes.iterableClass);
       if (node.entries.isEmpty && typeContextIsIterable && !typeContextIsMap) {
         // Set literal
@@ -3086,7 +3086,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
           result.inferredType, result.applyResult(invocation));
     } else {
       // TODO(johnniwinther): Handle augmentation of field with inferred types.
-      TypeInferenceEngine.resolveInferenceNode(member, classHierarchy);
+      TypeInferenceEngine.resolveInferenceNode(member, hierarchyBuilder);
       Link<NullAwareGuard> nullAwareGuards = const Link<NullAwareGuard>();
       DartType receiverType = member.getterType;
       Expression receiver = new StaticGet(member)..fileOffset = node.fileOffset;
@@ -5892,7 +5892,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
       return new ExpressionInferenceResult(replacementType, replacement);
     } else {
       // TODO(johnniwinther): Handle augmentation of field with inferred types.
-      TypeInferenceEngine.resolveInferenceNode(member, classHierarchy);
+      TypeInferenceEngine.resolveInferenceNode(member, hierarchyBuilder);
       DartType writeContext = member.setterType;
       ExpressionInferenceResult rhsResult =
           inferExpression(node.value, writeContext, isVoidAllowed: true);
@@ -6153,7 +6153,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
           readResult.inferredType, readResult.expression);
     } else {
       // TODO(johnniwinther): Handle augmentation of field with inferred types.
-      TypeInferenceEngine.resolveInferenceNode(member, classHierarchy);
+      TypeInferenceEngine.resolveInferenceNode(member, hierarchyBuilder);
       DartType type = member.getterType;
 
       if (member is Procedure && member.kind == ProcedureKind.Method) {
@@ -6302,7 +6302,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
   ExpressionInferenceResult visitStaticSet(
       StaticSet node, DartType typeContext) {
     Member writeMember = node.target;
-    TypeInferenceEngine.resolveInferenceNode(writeMember, classHierarchy);
+    TypeInferenceEngine.resolveInferenceNode(writeMember, hierarchyBuilder);
     DartType writeContext = writeMember.setterType;
     ExpressionInferenceResult rhsResult =
         inferExpression(node.value, writeContext, isVoidAllowed: true);
@@ -6318,7 +6318,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
   ExpressionInferenceResult visitStaticGet(
       StaticGet node, DartType typeContext) {
     Member target = node.target;
-    TypeInferenceEngine.resolveInferenceNode(target, classHierarchy);
+    TypeInferenceEngine.resolveInferenceNode(target, hierarchyBuilder);
     DartType type = target.getterType;
 
     if (!isNonNullableByDefault) {
@@ -6378,7 +6378,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
   InitializerInferenceResult visitSuperInitializer(SuperInitializer node) {
     ensureMemberType(node.target);
     Substitution substitution = Substitution.fromSupertype(
-        classHierarchy.getClassAsInstanceOf(
+        hierarchyBuilder.getClassAsInstanceOf(
             thisType!.classNode, node.target.enclosingClass)!);
     FunctionType functionType = replaceReturnType(
         substitution.substituteType(node.target.function