[cfe] Pass content maps to NameSpaceImpl

This moves the computation of the content map from getables/setable
outside the NameSpaceImpl. This is in preparation for implementing
getter/setter and final field/setter through the same PropertyBuilder.

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

Author: johnniwinther

pkg/front_end/lib/src/base/lookup_result.dart

@@ -110,6 +110,32 @@ abstract class LookupResult {
       }
     }
   }
+
+  static void addNamedBuilder(
+      Map<String, LookupResult> content, String name, NamedBuilder member,
+      {required bool setter}) {
+    LookupResult? existing = content[name];
+    if (existing != null) {
+      if (setter) {
+        assert(existing.getable != null,
+            "No existing getable for $name: $existing.");
+        content[name] = new GetableSetableResult(existing.getable!, member);
+        return;
+      } else {
+        assert(existing.setable != null,
+            "No existing setable for $name: $existing.");
+        content[name] = new GetableSetableResult(member, existing.setable!);
+        return;
+      }
+    }
+    if (member is LookupResult) {
+      content[name] = member as LookupResult;
+    } else {
+      // Coverage-ignore-block(suite): Not run.
+      content[name] =
+          setter ? new SetableResult(member) : new GetableResult(member);
+    }
+  }
 }
 
 class GetableResult implements LookupResult {

pkg/front_end/lib/src/base/name_space.dart

@@ -36,9 +36,6 @@ abstract class NameSpace {
 
 abstract class MutableNameSpace implements NameSpace {
   void addLocalMember(String name, NamedBuilder member, {required bool setter});
-
-  /// Adds [builder] to the extensions in this name space.
-  void addExtension(ExtensionBuilder builder);
 }
 
 abstract class ComputedNameSpace implements NameSpace {
@@ -54,6 +51,9 @@ abstract class ComputedMutableNameSpace
     implements MutableNameSpace, ComputedNameSpace {
   factory ComputedMutableNameSpace() = ComputedMutableNameSpaceImpl._;
 
+  /// Adds [builder] to the extensions in this name space.
+  void addExtension(ExtensionBuilder builder);
+
   void replaceLocalMember(String name, NamedBuilder member,
       {required bool setter});
 }
@@ -72,53 +72,14 @@ base class NameSpaceImpl implements MutableNameSpace {
   Set<ExtensionBuilder>? _extensions;
 
   NameSpaceImpl._(
-      {Map<String, NamedBuilder>? getables,
-      Map<String, NamedBuilder>? setables,
-      Set<ExtensionBuilder>? extensions})
-      : _extensions = extensions {
-    if (getables != null) {
-      for (MapEntry<String, NamedBuilder> entry in getables.entries) {
-        addLocalMember(entry.key, entry.value, setter: false);
-      }
-    }
-    if (setables != null) {
-      for (MapEntry<String, NamedBuilder> entry in setables.entries) {
-        addLocalMember(entry.key, entry.value, setter: true);
-      }
-    }
-  }
+      {Map<String, LookupResult>? content, Set<ExtensionBuilder>? extensions})
+      : _content = content,
+        _extensions = extensions;
 
   @override
   void addLocalMember(String name, NamedBuilder member,
       {required bool setter}) {
-    Map<String, LookupResult> content = _content ??= {};
-    LookupResult? existing = content[name];
-    if (existing != null) {
-      if (setter) {
-        assert(existing.getable != null,
-            "No existing getable for $name: $existing.");
-        content[name] = new GetableSetableResult(existing.getable!, member);
-        return;
-      } else {
-        assert(existing.setable != null,
-            "No existing setable for $name: $existing.");
-        content[name] = new GetableSetableResult(member, existing.setable!);
-        return;
-      }
-    }
-    if (member is LookupResult) {
-      content[name] = member as LookupResult;
-    } else {
-      // Coverage-ignore-block(suite): Not run.
-      content[name] =
-          setter ? new SetableResult(member) : new GetableResult(member);
-    }
-  }
-
-  @override
-  // Coverage-ignore(suite): Not run.
-  void addExtension(ExtensionBuilder builder) {
-    (_extensions ??= {}).add(builder);
+    LookupResult.addNamedBuilder(_content ??= {}, name, member, setter: setter);
   }
 
   @override
@@ -265,8 +226,7 @@ base class ComputedMutableNameSpaceImpl implements ComputedMutableNameSpace {
 
 final class SourceLibraryNameSpace extends NameSpaceImpl {
   SourceLibraryNameSpace(
-      {required Map<String, NamedBuilder> super.getables,
-      required Map<String, NamedBuilder> super.setables,
+      {required Map<String, LookupResult> super.content,
       required Set<ExtensionBuilder> super.extensions})
       : super._();
 }
@@ -346,8 +306,7 @@ abstract base class DeclarationNameSpaceBase extends NameSpaceImpl
   Map<String, MemberBuilder>? _constructors;
 
   DeclarationNameSpaceBase._(
-      {super.getables,
-      super.setables,
+      {super.content,
       super.extensions,
       Map<String, MemberBuilder>? constructors})
       : _constructors = constructors,
@@ -364,8 +323,7 @@ abstract base class DeclarationNameSpaceBase extends NameSpaceImpl
 
 final class SourceDeclarationNameSpace extends DeclarationNameSpaceBase {
   SourceDeclarationNameSpace(
-      {required Map<String, NamedBuilder> super.getables,
-      required Map<String, NamedBuilder> super.setables,
+      {required Map<String, LookupResult> super.content,
       required Map<String, MemberBuilder>? super.constructors})
       : super._();
 }

pkg/front_end/lib/src/source/type_parameter_scope_builder.dart

@@ -7,6 +7,7 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/reference_from_index.dart';
 import 'package:kernel/src/bounds_checks.dart' show VarianceCalculationValue;
 
+import '../base/lookup_result.dart';
 import '../base/messages.dart';
 import '../base/modifiers.dart';
 import '../base/name_space.dart';
@@ -1594,6 +1595,7 @@ class LibraryNameSpaceBuilder {
     required Map<SourceClassBuilder, TypeBuilder> mixinApplications,
     required List<NamedBuilder> memberBuilders,
   }) {
+    Map<String, LookupResult> content = {};
     Map<String, NamedBuilder> getables = {};
 
     Map<String, NamedBuilder> setables = {};
@@ -1693,8 +1695,15 @@ class LibraryNameSpaceBuilder {
       }
     }
 
-    return new SourceLibraryNameSpace(
-        getables: getables, setables: setables, extensions: extensions);
+    for (MapEntry<String, NamedBuilder> entry in getables.entries) {
+      LookupResult.addNamedBuilder(content, entry.key, entry.value,
+          setter: false);
+    }
+    for (MapEntry<String, NamedBuilder> entry in setables.entries) {
+      LookupResult.addNamedBuilder(content, entry.key, entry.value,
+          setter: true);
+    }
+    return new SourceLibraryNameSpace(content: content, extensions: extensions);
   }
 }
 
@@ -1893,6 +1902,7 @@ class DeclarationNameSpaceBuilder {
       required List<SourceMemberBuilder> constructorBuilders,
       required List<SourceMemberBuilder> memberBuilders}) {
     List<NominalParameterBuilder> unboundNominalParameters = [];
+    Map<String, LookupResult> content = {};
     Map<String, NamedBuilder> getables = {};
     Map<String, NamedBuilder> setables = {};
     Map<String, MemberBuilder> constructors = {};
@@ -1989,9 +1999,17 @@ class DeclarationNameSpaceBuilder {
     enclosingLibraryBuilder
         .registerUnboundNominalParameters(unboundNominalParameters);
 
+    for (MapEntry<String, NamedBuilder> entry in getables.entries) {
+      LookupResult.addNamedBuilder(content, entry.key, entry.value,
+          setter: false);
+    }
+    for (MapEntry<String, NamedBuilder> entry in setables.entries) {
+      LookupResult.addNamedBuilder(content, entry.key, entry.value,
+          setter: true);
+    }
+
     return new SourceDeclarationNameSpace(
-        getables: getables,
-        setables: setables,
+        content: content,
         // TODO(johnniwinther): Handle constructors in extensions consistently.
         // Currently they are not part of the name space but still processed
         // for instance when inferring redirecting factories.