[cfe] Remove MemberBuilder.isAbstract

This removes isAbstract from MemberBuilder in order to prepare for using one builder for a getter/setter pair.

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

Author: johnniwinther

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

@@ -470,10 +470,6 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
   // Coverage-ignore(suite): Not run.
   bool get isProperty => throw new UnsupportedError("$runtimeType.isProperty");
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isAbstract => false;
-
   @override
   // Coverage-ignore(suite): Not run.
   bool get isFinal => false;
@@ -482,10 +478,6 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
   // Coverage-ignore(suite): Not run.
   bool get isSynthesized => false;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isEnumElement => false;
-
   @override
   bool get isConflictingSetter => false;
 

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

@@ -14,8 +14,6 @@ abstract class IDeclarationBuilder implements ITypeDeclarationBuilder {
 
   LibraryBuilder get libraryBuilder;
 
-  //bool get isExtension;
-
   @override
   Uri get fileUri;
 

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

@@ -87,11 +87,6 @@ abstract class MemberBuilder implements Builder, LookupResult {
   /// the getter and setter capabilities.
   Iterable<Reference> get exportedMemberReferences;
 
-  bool get isAbstract;
-
-  /// Returns `true` if this member is declared by an enum element.
-  bool get isEnumElement;
-
   /// Returns `true` if this member is a setter that conflicts with the implicit
   /// setter of a field.
   bool get isConflictingSetter;
@@ -213,9 +208,6 @@ abstract class BuilderClassMember implements ClassMember {
     return declarationBuilder == objectClass;
   }
 
-  @override
-  bool get isAbstract => memberBuilder.isAbstract;
-
   @override
   // Coverage-ignore(suite): Not run.
   bool get isSynthesized => false;

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

@@ -7,12 +7,19 @@ import 'package:kernel/ast.dart';
 import 'member_builder.dart';
 
 abstract class MethodBuilder implements MemberBuilder {
+  bool get isAbstract;
+
+  /// Returns `true` if this method is an operator method.
   bool get isOperator;
 
   @override
   Reference get invokeTargetReference;
 }
 
+/// Helper extension with helpers that are derived from other properties of
+/// a [MethodBuilder].
 extension MethodBuilderExtension on MethodBuilder {
+  /// Return `true` if this method is a regular method, i.e. _not_ an operator
+  /// method.
   bool get isRegularMethod => !isOperator;
 }

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

@@ -9,6 +9,9 @@ abstract class PropertyBuilder implements MemberBuilder {
   /// Returns `true` if this property builder has a constant field declaration.
   bool get hasConstField;
 
+  /// Returns `true` if this property is declared by an enum element.
+  bool get isEnumElement;
+
   /// Returns a [FieldQuality] enum value that describes what kind of field this
   /// property has, if any.
   FieldQuality get fieldQuality;
@@ -221,7 +224,9 @@ extension PropertyBuilderExtension on PropertyBuilder {
 
   /// Returns `true` if this property builder has an abstract getter
   /// declaration.
-  bool get hasAbstractGetter => getterQuality == GetterQuality.Abstract;
+  bool get hasAbstractGetter =>
+      getterQuality == GetterQuality.Abstract ||
+      getterQuality == GetterQuality.ImplicitAbstract;
 
   /// Returns `true` if this property builder has an explicit getter, i.e. is
   /// has a getter that is not an implicit getter from a field declaration.
@@ -234,6 +239,12 @@ extension PropertyBuilderExtension on PropertyBuilder {
   /// Returns `true` if this property builder has a setter.
   bool get hasSetter => setterQuality != SetterQuality.Absent;
 
+  /// Returns `true` if this property builder has an abstract setter
+  /// declaration.
+  bool get hasAbstractSetter =>
+      setterQuality == SetterQuality.Abstract ||
+      setterQuality == SetterQuality.ImplicitAbstract;
+
   /// Returns `true` if this property builder has an explicit setter, i.e. is
   /// has a setter that is not an implicit setter from a field declaration.
   bool get hasExplicitSetter =>

pkg/front_end/lib/src/dill/dill_builder_mixins.dart

@@ -50,10 +50,6 @@ mixin DillConstructorBuilderMixin
   // Coverage-ignore(suite): Not run.
   bool get isProperty => false;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isEnumElement => false;
-
   @override
   // Coverage-ignore(suite): Not run.
   Member? get writeTarget => null;
@@ -193,10 +189,6 @@ mixin DillMethodBuilderMixin implements DillMemberBuilder, MethodBuilder {
   @override
   bool get isOperator => false;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isEnumElement => false;
-
   @override
   Builder get getable => this;
 
@@ -228,10 +220,6 @@ mixin DillOperatorBuilderMixin implements DillMemberBuilder, MethodBuilder {
   @override
   bool get isOperator => true;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isEnumElement => false;
-
   @override
   // Coverage-ignore(suite): Not run.
   Builder get getable => this;
@@ -270,10 +258,6 @@ mixin DillFactoryBuilderMixin implements DillMemberBuilder, FactoryBuilder {
   // Coverage-ignore(suite): Not run.
   bool get isProperty => false;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isEnumElement => false;
-
   @override
   // Coverage-ignore(suite): Not run.
   Builder get getable => this;

pkg/front_end/lib/src/dill/dill_class_builder.dart

@@ -127,19 +127,19 @@ class DillClassBuilder extends ClassBuilderImpl
     DillFieldBuilder builder =
         new DillFieldBuilder(field, libraryBuilder, this);
     String name = field.name.text;
-    nameSpace.addLocalMember(name, builder, setter: false);
+    _nameSpace.addLocalMember(name, builder, setter: false);
   }
 
   void addConstructor(Constructor constructor, Procedure? constructorTearOff) {
     DillConstructorBuilder builder = new DillConstructorBuilder(
         constructor, constructorTearOff, libraryBuilder, this);
     String name = constructor.name.text;
-    nameSpace.addConstructor(name, builder);
+    _nameSpace.addConstructor(name, builder);
   }
 
   void addFactory(Procedure factory, Procedure? factoryTearOff) {
     String name = factory.name.text;
-    nameSpace.addConstructor(name,
+    _nameSpace.addConstructor(name,
         new DillFactoryBuilder(factory, factoryTearOff, libraryBuilder, this));
   }
 
@@ -150,22 +150,22 @@ class DillClassBuilder extends ClassBuilderImpl
         // Coverage-ignore(suite): Not run.
         throw new UnsupportedError("Use addFactory for adding factories");
       case ProcedureKind.Setter:
-        nameSpace.addLocalMember(
+        _nameSpace.addLocalMember(
             name, new DillSetterBuilder(procedure, libraryBuilder, this),
             setter: true);
         break;
       case ProcedureKind.Getter:
-        nameSpace.addLocalMember(
+        _nameSpace.addLocalMember(
             name, new DillGetterBuilder(procedure, libraryBuilder, this),
             setter: false);
         break;
       case ProcedureKind.Operator:
-        nameSpace.addLocalMember(
+        _nameSpace.addLocalMember(
             name, new DillOperatorBuilder(procedure, libraryBuilder, this),
             setter: false);
         break;
       case ProcedureKind.Method:
-        nameSpace.addLocalMember(
+        _nameSpace.addLocalMember(
             name, new DillMethodBuilder(procedure, libraryBuilder, this),
             setter: false);
         break;

pkg/front_end/lib/src/dill/dill_extension_builder.dart

@@ -33,7 +33,7 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
         case ExtensionMemberKind.Method:
           if (descriptor.isStatic) {
             Procedure procedure = descriptor.memberReference!.asProcedure;
-            nameSpace.addLocalMember(
+            _nameSpace.addLocalMember(
                 name.text,
                 new DillExtensionStaticMethodBuilder(
                     procedure, descriptor, libraryBuilder, this),
@@ -42,7 +42,7 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
             Procedure procedure = descriptor.memberReference!.asProcedure;
             Procedure? tearOff = descriptor.tearOffReference?.asProcedure;
             assert(tearOff != null, "No tear found for ${descriptor}");
-            nameSpace.addLocalMember(
+            _nameSpace.addLocalMember(
                 name.text,
                 new DillExtensionInstanceMethodBuilder(
                     procedure, descriptor, libraryBuilder, this, tearOff!),
@@ -51,31 +51,31 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
           break;
         case ExtensionMemberKind.Getter:
           Procedure procedure = descriptor.memberReference!.asProcedure;
-          nameSpace.addLocalMember(
+          _nameSpace.addLocalMember(
               name.text,
               new DillExtensionGetterBuilder(
                   procedure, descriptor, libraryBuilder, this),
               setter: false);
           break;
         case ExtensionMemberKind.Field:
           Field field = descriptor.memberReference!.asField;
-          nameSpace.addLocalMember(
+          _nameSpace.addLocalMember(
               name.text,
               new DillExtensionFieldBuilder(
                   field, descriptor, libraryBuilder, this),
               setter: false);
           break;
         case ExtensionMemberKind.Setter:
           Procedure procedure = descriptor.memberReference!.asProcedure;
-          nameSpace.addLocalMember(
+          _nameSpace.addLocalMember(
               name.text,
               new DillExtensionSetterBuilder(
                   procedure, descriptor, libraryBuilder, this),
               setter: true);
           break;
         case ExtensionMemberKind.Operator:
           Procedure procedure = descriptor.memberReference!.asProcedure;
-          nameSpace.addLocalMember(
+          _nameSpace.addLocalMember(
               name.text,
               new DillExtensionOperatorBuilder(
                   procedure, descriptor, libraryBuilder, this),