[cfe] Decouple member type inference from concrete member builders

Change-Id: I90031f57d5b57cb5d93ed2b0a9fcbfa91f05171d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398900
Reviewed-by: Chloe Stefantsova <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/builder/member_builder.dart

@@ -17,7 +17,22 @@ abstract class MemberBuilder implements Builder {
 
   LibraryBuilder get libraryBuilder;
 
-  /// The declared name of this member;
+  /// The declared name of this member.
+  ///
+  /// For extension and extension type members this is different from the
+  /// name of the generated members.
+  ///
+  /// For instance for
+  ///
+  ///     extension E {
+  ///       get foo => null;
+  ///     }
+  ///     extension type E(int id) {
+  ///       get foo => null;
+  ///     }
+  ///
+  /// the [memberName] is `foo` for bother getters, but the name of the
+  /// generated members is `E|foo` and `ET|foo`, respectively.
   Name get memberName;
 
   /// The [Member] to use when reading from this member builder.

pkg/front_end/lib/src/kernel/hierarchy/class_member.dart

@@ -326,6 +326,10 @@ abstract class ClassMember {
   ClassMember get interfaceMember;
 
   void inferType(ClassMembersBuilder membersBuilder);
+
+  /// Registers that this class member overrides [overriddenMembers].
+  ///
+  /// This is used to infer types from the [overriddenMembers].
   void registerOverrideDependency(Set<ClassMember> overriddenMembers);
 
   /// Returns `true` if this has the same underlying declaration as [other].

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

@@ -6,9 +6,9 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchyMembers;
 
 import '../../builder/declaration_builders.dart';
+import '../../builder/formal_parameter_builder.dart';
+import '../../builder/type_builder.dart';
 import '../../source/source_class_builder.dart';
-import '../../source/source_field_builder.dart';
-import '../../source/source_procedure_builder.dart';
 import 'class_member.dart';
 import 'delayed.dart';
 import 'extension_type_members.dart';
@@ -76,44 +76,74 @@ class ClassMembersBuilder implements ClassHierarchyMembers {
     return list;
   }
 
-  void inferFieldType(SourceFieldBuilder declaredMember,
-      Iterable<ClassMember> overriddenMembers) {
-    ClassMembersNodeBuilder.inferFieldType(
-        hierarchyBuilder,
-        this,
-        declaredMember.classBuilder as SourceClassBuilder,
-        declaredMember,
-        overriddenMembers);
-  }
-
-  void inferGetterType(SourceProcedureBuilder declaredMember,
-      Iterable<ClassMember> overriddenMembers) {
-    ClassMembersNodeBuilder.inferGetterType(
-        hierarchyBuilder,
-        this,
-        declaredMember.classBuilder as SourceClassBuilder,
-        declaredMember,
-        overriddenMembers);
-  }
-
-  void inferSetterType(SourceProcedureBuilder declaredMember,
-      Iterable<ClassMember> overriddenMembers) {
-    ClassMembersNodeBuilder.inferSetterType(
-        hierarchyBuilder,
-        this,
-        declaredMember.classBuilder as SourceClassBuilder,
-        declaredMember,
-        overriddenMembers);
-  }
-
-  void inferMethodType(SourceProcedureBuilder declaredMember,
-      Iterable<ClassMember> overriddenMembers) {
+  void inferFieldType(SourceClassBuilder enclosingClassBuilder,
+      TypeBuilder declaredFieldType, Iterable<ClassMember> overriddenMembers,
+      {required String name,
+      required Uri fileUri,
+      required int fileOffset,
+      required int nameLength,
+      required bool isAssignable}) {
+    ClassMembersNodeBuilder.inferFieldType(hierarchyBuilder, this,
+        enclosingClassBuilder, declaredFieldType, overriddenMembers,
+        name: name,
+        fileUri: fileUri,
+        fileOffset: fileOffset,
+        nameLength: nameLength,
+        isAssignable: isAssignable);
+  }
+
+  void inferGetterType(SourceClassBuilder enclosingClassBuilder,
+      TypeBuilder declaredTypeBuilder, Iterable<ClassMember> overriddenMembers,
+      {required String name,
+      required Uri fileUri,
+      required int fileOffset,
+      required int nameLength}) {
+    ClassMembersNodeBuilder.inferGetterType(hierarchyBuilder, this,
+        enclosingClassBuilder, declaredTypeBuilder, overriddenMembers,
+        name: name,
+        fileUri: fileUri,
+        fileOffset: fileOffset,
+        nameLength: nameLength);
+  }
+
+  void inferSetterType(
+      SourceClassBuilder enclosingClassBuilder,
+      List<FormalParameterBuilder>? formals,
+      Iterable<ClassMember> overriddenMembers,
+      {required String name,
+      required Uri fileUri,
+      required int fileOffset,
+      required int nameLength}) {
+    ClassMembersNodeBuilder.inferSetterType(hierarchyBuilder, this,
+        enclosingClassBuilder, formals, overriddenMembers,
+        name: name,
+        fileUri: fileUri,
+        fileOffset: fileOffset,
+        nameLength: nameLength);
+  }
+
+  void inferMethodType(
+      SourceClassBuilder enclosingClassBuilder,
+      FunctionNode declaredFunction,
+      TypeBuilder declaredReturnType,
+      List<FormalParameterBuilder>? formals,
+      Iterable<ClassMember> overriddenMembers,
+      {required String name,
+      required Uri fileUri,
+      required int fileOffset,
+      required int nameLength}) {
     ClassMembersNodeBuilder.inferMethodType(
         hierarchyBuilder,
         this,
-        declaredMember.classBuilder as SourceClassBuilder,
-        declaredMember,
-        overriddenMembers);
+        enclosingClassBuilder,
+        declaredFunction,
+        declaredReturnType,
+        formals,
+        overriddenMembers,
+        name: name,
+        fileUri: fileUri,
+        fileOffset: fileOffset,
+        nameLength: nameLength);
   }
 
   ClassMembersNode getNodeFromClassBuilder(ClassBuilder classBuilder) {