[cfe] Remove MemberBuilder.isConflictingSetter

Setters declared before assignable fields are now treated as the primary
declaration and the assignable field as the duplicate.

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

Author: johnniwinther

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

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import '../builder/builder.dart';
-import '../builder/member_builder.dart';
 import 'scope.dart';
 
 abstract class LookupResult {
@@ -37,20 +36,10 @@ abstract class LookupResult {
     }
     if (setable != null) {
       if (setable.next != null) {
-        AmbiguousBuilder ambiguousBuilder =
-            setable = new AmbiguousBuilder(name, setable, fileOffset, fileUri);
-        Builder firstSetable = ambiguousBuilder.getFirstDeclaration();
-        if (firstSetable is MemberBuilder && firstSetable.isConflictingSetter) {
-          setable = null;
-        }
-        changed = true;
-      } else if (setable is MemberBuilder && setable.isConflictingSetter) {
-        setable = null;
+        setable = new AmbiguousBuilder(name, setable, fileOffset, fileUri);
         changed = true;
       }
-      if (setable != null &&
-          staticOnly &&
-          setable.isDeclarationInstanceMember) {
+      if (staticOnly && setable.isDeclarationInstanceMember) {
         setable = null;
         changed = true;
       }

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

@@ -6,7 +6,6 @@ import '../builder/builder.dart';
 import '../builder/declaration_builders.dart';
 import '../builder/library_builder.dart';
 import '../builder/member_builder.dart';
-import '../builder/property_builder.dart';
 import 'lookup_result.dart';
 import 'scope.dart';
 import 'uris.dart';
@@ -119,11 +118,7 @@ base class ComputedMutableNameSpaceImpl implements ComputedMutableNameSpace {
         assert(
             existing.setable == null ||
                 // Coverage-ignore(suite): Not run.
-                existing.setable == member ||
-                // Coverage-ignore(suite): Not run.
-                // TODO(johnniwinther): Remove this case when getables and
-                //  setables are contained in the same map in the name space.
-                (member is PropertyBuilder && member.isConflictingSetter),
+                existing.setable == member,
             "Trying to map setable $member to $name "
             "replacing the existing value ${existing.setable}");
         if (existing.getable != null) {

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

@@ -410,8 +410,7 @@ class AmbiguousBuilder extends ProblemBuilder {
   @override
   Message get message => templateDuplicatedDeclarationUse.withArguments(name);
 
-  // TODO(ahe): Also provide context.
-
+  // Coverage-ignore(suite): Not run.
   NamedBuilder getFirstDeclaration() {
     NamedBuilder declaration = builder;
     while (declaration.next != null) {
@@ -474,10 +473,6 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
   // Coverage-ignore(suite): Not run.
   bool get isSynthesized => false;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isConflictingSetter => false;
-
   @override
   DeclarationBuilder get declarationBuilder {
     throw new UnsupportedError('$runtimeType.declarationBuilder');

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

@@ -94,11 +94,6 @@ mixin DeclarationBuilderMixin implements IDeclarationBuilder {
       } else if (builder.isDuplicate) {
         // Duplicates are not visible in the instance scope.
         builder = null;
-      } else if (builder is MemberBuilder && builder.isConflictingSetter) {
-        // Conflicting setters are not visible in the instance scope.
-        // TODO(johnniwinther): Should we return an [AmbiguousBuilder] here and
-        // above?
-        builder = null;
       }
     }
     return builder as MemberBuilder?;

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

@@ -88,10 +88,6 @@ abstract class MemberBuilder implements Builder, LookupResult, NamedBuilder {
   /// the getter and setter capabilities.
   Iterable<Reference> get exportedMemberReferences;
 
-  /// Returns `true` if this member is a setter that conflicts with the implicit
-  /// setter of a field.
-  bool get isConflictingSetter;
-
   /// Returns the [ClassMember]s for the non-setter members created for this
   /// member builder.
   ///
@@ -156,9 +152,6 @@ abstract class MemberBuilderImpl extends NamedBuilderImpl
   @override
   bool get isTopLevel => !isDeclarationMember;
 
-  @override
-  bool get isConflictingSetter => false;
-
   @override
   String get fullNameForErrors => name;
 }

pkg/front_end/lib/src/fragment/setter/declaration.dart

@@ -263,9 +263,8 @@ class RegularSetterDeclaration
   }
 
   @override
-  List<ClassMember> get localSetters => _fragment.builder.isConflictingSetter
-      ? const []
-      : [new SetterClassMember(_fragment.builder)];
+  List<ClassMember> get localSetters =>
+      [new SetterClassMember(_fragment.builder)];
 }
 
 /// Interface for using a [SetterFragment] to create a [BodyBuilderContext].

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

@@ -164,7 +164,7 @@ mixin SourceDeclarationBuilderMixin
   void _buildMember(SourceMemberBuilder memberBuilder, Member member,
       Member? tearOff, BuiltMemberKind memberKind,
       {required bool addMembersToLibrary}) {
-    if (!memberBuilder.isDuplicate && !memberBuilder.isConflictingSetter) {
+    if (!memberBuilder.isDuplicate) {
       if (memberKind == BuiltMemberKind.ExtensionTypeRepresentationField) {
         addMemberInternal(memberBuilder, memberKind, member, tearOff);
       } else {

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

@@ -1324,7 +1324,7 @@ class SourceClassBuilder extends ClassBuilderImpl
 
   void _addMemberToClass(SourceMemberBuilder memberBuilder, Member member) {
     member.parent = cls;
-    if (!memberBuilder.isDuplicate && !memberBuilder.isConflictingSetter) {
+    if (!memberBuilder.isDuplicate) {
       if (member is Procedure) {
         cls.addProcedure(member);
       } else if (member is Field) {

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

@@ -383,13 +383,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
     if (existing == member) {
       return false;
     } else {
-      if (member is MemberBuilder && member.isConflictingSetter) {
-        // Coverage-ignore-block(suite): Not run.
-        // TODO(johnniwinther): Remove this case when getables and setables are
-        //  contained in the same map in the name space.
-        _exportNameSpace.addLocalMember(name, member, setter: isSetter);
-        return true;
-      } else if (existing != null) {
+      if (existing != null) {
         NamedBuilder result = _computeAmbiguousDeclarationForExport(
             name, existing, member,
             uriOffset: uriOffset);
@@ -1056,7 +1050,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       }
     } else if (member is Procedure) {
       member.isStatic = true;
-      if (!declaration.isDuplicate && !declaration.isConflictingSetter) {
+      if (!declaration.isDuplicate) {
         library.addProcedure(member);
       }
     } else {

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

@@ -93,19 +93,6 @@ abstract class SourceMemberBuilderImpl extends MemberBuilderImpl
             new MemberDataForTesting()
             : null;
 
-  bool? _isConflictingSetter;
-
-  @override
-  bool get isConflictingSetter {
-    return _isConflictingSetter ??= false;
-  }
-
-  void set isConflictingSetter(bool value) {
-    assert(_isConflictingSetter == null,
-        '$this.isConflictingSetter has already been fixed.');
-    _isConflictingSetter = value;
-  }
-
   @override
   // Coverage-ignore(suite): Not run.
   void buildOutlineExpressions(ClassHierarchy classHierarchy,