[cfe] Remove SourceProcedureBuilder

This removes the SourceProcedureBuilder. This is achieved by adding SyntheticMethodBuilder for creating synthesized methods, currently only used for `_enumToString` in enums, changin the creation of Expression for expression compilation to avoid the need for a SourceMemberBuilder.

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

Author: johnniwinther

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

@@ -2126,18 +2126,19 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
           lastGoodKernelTarget.objectClassBuilder,
           lastGoodKernelTarget.dynamicType);
       debugLibrary.buildOutlineNodes(lastGoodKernelTarget.loader.coreLibrary);
+
+      Procedure procedure = new Procedure(
+          new Name(syntheticProcedureName), ProcedureKind.Method, parameters,
+          isStatic: isStatic, fileUri: debugLibrary.fileUri);
+
       Expression compiledExpression = await lastGoodKernelTarget.loader
           .buildExpression(
               debugLibrary,
               className ?? extensionName,
               (className != null && !isStatic) || extensionThis != null,
-              parameters,
+              procedure,
               extensionThis);
 
-      Procedure procedure = new Procedure(
-          new Name(syntheticProcedureName), ProcedureKind.Method, parameters,
-          isStatic: isStatic, fileUri: debugLibrary.fileUri);
-
       parameters.body = new ReturnStatement(compiledExpression)
         ..parent = parameters;
 

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

@@ -336,7 +336,6 @@ abstract class BuilderImpl implements Builder {
   bool get isSetter => false;
 
   @override
-  // Coverage-ignore(suite): Not run.
   bool get isStatic => false;
 
   @override

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

@@ -209,6 +209,7 @@ abstract class BuilderClassMember implements ClassMember {
   bool get isField => memberBuilder.isField;
 
   @override
+  // Coverage-ignore(suite): Not run.
   bool get isGetter => memberBuilder.isGetter;
 
   @override

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

@@ -0,0 +1,12 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:kernel/ast.dart';
+
+import 'member_builder.dart';
+
+abstract class MethodBuilder implements MemberBuilder {
+  @override
+  Reference get invokeTargetReference;
+}

pkg/front_end/lib/src/kernel/body_builder_context.dart

@@ -29,12 +29,10 @@ import '../source/source_field_builder.dart';
 import '../source/source_function_builder.dart';
 import '../source/source_library_builder.dart';
 import '../source/source_member_builder.dart';
-import '../source/source_procedure_builder.dart';
 import '../source/source_type_alias_builder.dart';
 import '../type_inference/inference_results.dart'
     show InitializerInferenceResult;
 import '../type_inference/type_inferrer.dart' show TypeInferrer;
-import '../type_inference/type_schema.dart' show UnknownType;
 import 'expression_generator_helper.dart';
 import 'internal_ast.dart';
 
@@ -841,44 +839,6 @@ mixin _FunctionBodyBuilderContextMixin<T extends SourceFunctionBuilder>
   }
 }
 
-mixin _ProcedureBodyBuilderContextMixin<T extends SourceProcedureBuilder>
-    implements BodyBuilderContext {
-  T get _member;
-
-  @override
-  // Coverage-ignore(suite): Not run.
-  void setAsyncModifier(AsyncMarker asyncModifier) {
-    _member.asyncModifier = asyncModifier;
-  }
-
-  @override
-  // Coverage-ignore(suite): Not run.
-  DartType get returnTypeContext {
-    final bool isReturnTypeUndeclared =
-        _member.returnType is OmittedTypeBuilder &&
-            _member.function.returnType is DynamicType;
-    return isReturnTypeUndeclared
-        ? const UnknownType()
-        : _member.function.returnType;
-  }
-}
-
-class ProcedureBodyBuilderContext extends BodyBuilderContext
-    with
-        _MemberBodyBuilderContext<SourceProcedureBuilder>,
-        _FunctionBodyBuilderContextMixin<SourceProcedureBuilder>,
-        _ProcedureBodyBuilderContextMixin<SourceProcedureBuilder> {
-  @override
-  final SourceProcedureBuilder _member;
-
-  @override
-  final Member _builtMember;
-
-  ProcedureBodyBuilderContext(this._member, this._builtMember)
-      : super(_member.libraryBuilder, _member.declarationBuilder,
-            isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
-}
-
 mixin _ConstructorBodyBuilderContextMixin<T extends ConstructorDeclaration>
     implements BodyBuilderContext {
   T get _member;
@@ -1058,17 +1018,25 @@ class ParameterBodyBuilderContext extends BodyBuilderContext {
 }
 
 // Coverage-ignore(suite): Not run.
-class ExpressionCompilerProcedureBodyBuildContext extends BodyBuilderContext
-    with _MemberBodyBuilderContext<SourceProcedureBuilder> {
-  @override
-  final SourceProcedureBuilder _member;
-
-  @override
-  final Member _builtMember;
+class ExpressionCompilerProcedureBodyBuildContext extends BodyBuilderContext {
+  final Procedure _procedure;
 
   ExpressionCompilerProcedureBodyBuildContext(
-      DietListener listener, this._member, this._builtMember,
+      DietListener listener, this._procedure,
       {required bool isDeclarationInstanceMember})
       : super(listener.libraryBuilder, listener.currentDeclaration,
             isDeclarationInstanceMember: isDeclarationInstanceMember);
+
+  @override
+  AugmentSuperTarget? get augmentSuperTarget {
+    return null;
+  }
+
+  @override
+  int get memberNameOffset => _procedure.fileOffset;
+
+  @override
+  void registerSuperCall() {
+    _procedure.transformerFlags |= TransformerFlag.superCalls;
+  }
 }

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

@@ -290,7 +290,7 @@ abstract class ClassMember {
 
   /// The interface member corresponding to this member.
   ///
-  /// If this member is declared on the source, the interface member is
+  /// If this member is declared in the source, the interface member is
   /// the member itself. For instance
   ///
   ///     abstract class Class {

pkg/front_end/lib/src/kernel/macro/introspectors.dart

@@ -22,7 +22,6 @@ import '../../source/source_field_builder.dart';
 import '../../source/source_loader.dart';
 import '../../source/source_member_builder.dart';
 import '../../source/source_method_builder.dart';
-import '../../source/source_procedure_builder.dart';
 import '../../source/source_property_builder.dart';
 import '../hierarchy/hierarchy_builder.dart';
 import 'identifiers.dart';
@@ -128,9 +127,7 @@ class MacroIntrospection {
 
   /// Creates the [macro.Declaration] corresponding to [memberBuilder].
   macro.Declaration _createMemberDeclaration(MemberBuilder memberBuilder) {
-    if (memberBuilder is SourceProcedureBuilder) {
-      return _createFunctionDeclaration(memberBuilder);
-    } else if (memberBuilder is SourceMethodBuilder) {
+    if (memberBuilder is SourceMethodBuilder) {
       return _createMethodDeclaration(memberBuilder);
     } else if (memberBuilder is SourcePropertyBuilder) {
       return _createGetterDeclaration(memberBuilder);
@@ -499,78 +496,6 @@ class MacroIntrospection {
     return declaration;
   }
 
-  /// Creates the [macro.FunctionDeclaration] corresponding to [builder].
-  macro.FunctionDeclaration _createFunctionDeclaration(
-      SourceProcedureBuilder builder) {
-    var (
-      List<macro.FormalParameterDeclarationImpl> positionalParameters,
-      List<macro.FormalParameterDeclarationImpl> namedParameters
-    ) = _createParameters(builder.libraryBuilder, builder.formals);
-
-    macro.ParameterizedTypeDeclaration? definingTypeDeclaration = null;
-    Builder? parent = builder.parent;
-    if (parent is ClassBuilder) {
-      definingTypeDeclaration = getClassDeclaration(parent);
-    } else if (parent is ExtensionTypeDeclarationBuilder) {
-      definingTypeDeclaration = getExtensionTypeDeclaration(parent);
-    }
-    final macro.LibraryImpl library = getLibrary(builder.libraryBuilder);
-    macro.FunctionDeclaration declaration;
-    if (definingTypeDeclaration != null) {
-      // TODO(johnniwinther): Should static fields be field or variable
-      //  declarations?
-      declaration = new macro.MethodDeclarationImpl(
-          id: macro.RemoteInstance.uniqueId,
-          identifier: new MemberBuilderIdentifier(
-              memberBuilder: builder,
-              id: macro.RemoteInstance.uniqueId,
-              name: builder.name),
-          library: library,
-          // TODO(johnniwinther): Provide metadata annotations.
-          metadata: const [],
-          definingType:
-              definingTypeDeclaration.identifier as macro.IdentifierImpl,
-          // TODO(johnniwinther): Real implementation of hasBody.
-          hasBody: true,
-          hasExternal: builder.isExternal,
-          isGetter: builder.isGetter,
-          isOperator: builder.isOperator,
-          isSetter: builder.isSetter,
-          hasStatic: builder.isStatic,
-          positionalParameters: positionalParameters,
-          namedParameters: namedParameters,
-          returnType: types.getTypeAnnotation(
-              builder.libraryBuilder, builder.returnType),
-          // TODO(johnniwinther): Support typeParameters
-          typeParameters: const []);
-    } else {
-      declaration = new macro.FunctionDeclarationImpl(
-          id: macro.RemoteInstance.uniqueId,
-          identifier: new MemberBuilderIdentifier(
-              memberBuilder: builder,
-              id: macro.RemoteInstance.uniqueId,
-              name: builder.name),
-          library: library,
-          // TODO(johnniwinther): Provide metadata annotations.
-          metadata: const [],
-          // TODO(johnniwinther): Real implementation of hasBody.
-          hasBody: true,
-          hasExternal: builder.isExternal,
-          isGetter: builder.isGetter,
-          isOperator: builder.isOperator,
-          isSetter: builder.isSetter,
-          positionalParameters: positionalParameters,
-          namedParameters: namedParameters,
-          returnType: types.getTypeAnnotation(
-              builder.libraryBuilder, builder.returnType),
-          // TODO(johnniwinther): Support typeParameters
-          typeParameters: const []);
-    }
-    _declarationOffsets[declaration] =
-        new UriOffset(builder.fileUri, builder.fileOffset);
-    return declaration;
-  }
-
   /// Creates the [macro.FunctionDeclaration] corresponding to [builder].
   macro.FunctionDeclaration _createMethodDeclaration(
       SourceMethodBuilder builder) {
@@ -973,8 +898,7 @@ class _DeclarationPhaseIntrospector extends _TypePhaseIntrospector
           classBuilder.fullMemberIterator();
       while (iterator.moveNext()) {
         SourceMemberBuilder memberBuilder = iterator.current;
-        if (memberBuilder is SourceProcedureBuilder ||
-            memberBuilder is SourceMethodBuilder ||
+        if (memberBuilder is SourceMethodBuilder ||
             memberBuilder is SourcePropertyBuilder) {
           result.add(_introspection.getMemberDeclaration(memberBuilder)
               as macro.MethodDeclaration);
@@ -987,8 +911,7 @@ class _DeclarationPhaseIntrospector extends _TypePhaseIntrospector
           extensionTypeDeclarationBuilder.fullMemberIterator();
       while (iterator.moveNext()) {
         SourceMemberBuilder memberBuilder = iterator.current;
-        if (memberBuilder is SourceProcedureBuilder ||
-            memberBuilder is SourceMethodBuilder ||
+        if (memberBuilder is SourceMethodBuilder ||
             memberBuilder is SourcePropertyBuilder) {
           result.add(_introspection.getMemberDeclaration(memberBuilder)
               as macro.MethodDeclaration);

pkg/front_end/lib/src/kernel/macro/macro.dart

@@ -32,9 +32,9 @@ import '../../source/source_field_builder.dart';
 import '../../source/source_library_builder.dart';
 import '../../source/source_loader.dart';
 import '../../source/source_method_builder.dart';
-import '../../source/source_procedure_builder.dart';
 import '../../source/source_property_builder.dart';
 import '../../source/source_type_alias_builder.dart';
+import '../../source/synthetic_method_builder.dart';
 import '../benchmarker.dart' show BenchmarkSubdivides, Benchmarker;
 import '../hierarchy/hierarchy_builder.dart';
 import 'annotation_parser.dart';
@@ -478,19 +478,7 @@ class MacroApplications {
         Iterator<Builder> memberIterator = builder.localMemberIterator();
         while (memberIterator.moveNext()) {
           Builder memberBuilder = memberIterator.current;
-          if (memberBuilder is SourceProcedureBuilder) {
-            List<MacroApplication>? macroApplications = prebuildAnnotations(
-                enclosingLibrary: libraryBuilder,
-                scope: builder.scope,
-                fileUri: memberBuilder.fileUri,
-                metadataBuilders: memberBuilder.metadata,
-                currentMacroDeclarations: currentMacroDeclarations);
-            if (macroApplications != null) {
-              classMacroApplicationData.memberApplications[memberBuilder] =
-                  new MemberApplicationData(_macroIntrospection, libraryBuilder,
-                      memberBuilder, macroApplications);
-            }
-          } else if (memberBuilder is SourceMethodBuilder) {
+          if (memberBuilder is SourceMethodBuilder) {
             List<MacroApplication>? macroApplications = prebuildAnnotations(
                 enclosingLibrary: libraryBuilder,
                 scope: builder.scope,
@@ -502,6 +490,8 @@ class MacroApplications {
                   new MemberApplicationData(_macroIntrospection, libraryBuilder,
                       memberBuilder, macroApplications);
             }
+          } else if (memberBuilder is SyntheticMethodBuilder) {
+            // [SyntheticMethodBuilder] doesn't have metadata.
           } else if (memberBuilder is SourcePropertyBuilder) {
             List<MacroApplication>? macroApplications = prebuildAnnotations(
                 enclosingLibrary: libraryBuilder,
@@ -570,18 +560,6 @@ class MacroApplications {
           libraryMacroApplicationData.classData[builder] =
               classMacroApplicationData;
         }
-      } else if (builder is SourceProcedureBuilder) {
-        List<MacroApplication>? macroApplications = prebuildAnnotations(
-            enclosingLibrary: libraryBuilder,
-            scope: libraryBuilder.scope,
-            fileUri: builder.fileUri,
-            metadataBuilders: builder.metadata,
-            currentMacroDeclarations: currentMacroDeclarations);
-        if (macroApplications != null) {
-          libraryMacroApplicationData.memberApplications[builder] =
-              new MemberApplicationData(_macroIntrospection, libraryBuilder,
-                  builder, macroApplications);
-        }
       } else if (builder is SourceMethodBuilder) {
         List<MacroApplication>? macroApplications = prebuildAnnotations(
             enclosingLibrary: libraryBuilder,
@@ -648,19 +626,6 @@ class MacroApplications {
                   new MemberApplicationData(_macroIntrospection, libraryBuilder,
                       memberBuilder, macroApplications);
             }
-          } else if (memberBuilder is SourceProcedureBuilder) {
-            List<MacroApplication>? macroApplications = prebuildAnnotations(
-                enclosingLibrary: libraryBuilder,
-                scope: builder.scope,
-                fileUri: memberBuilder.fileUri,
-                metadataBuilders: memberBuilder.metadata,
-                currentMacroDeclarations: currentMacroDeclarations);
-            if (macroApplications != null) {
-              extensionTypeMacroApplicationData
-                      .memberApplications[memberBuilder] =
-                  new MemberApplicationData(_macroIntrospection, libraryBuilder,
-                      memberBuilder, macroApplications);
-            }
           } else if (memberBuilder is SourcePropertyBuilder) {
             List<MacroApplication>? macroApplications = prebuildAnnotations(
                 enclosingLibrary: libraryBuilder,

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

@@ -1102,6 +1102,7 @@ class SourceClassBuilder extends ClassBuilderImpl
     }
   }
 
+  // Coverage-ignore(suite): Not run.
   void checkVarianceInFunction(Procedure procedure,
       TypeEnvironment typeEnvironment, List<TypeParameter> typeParameters) {
     List<TypeParameter> functionTypeParameters =
@@ -1113,7 +1114,6 @@ class SourceClassBuilder extends ClassBuilderImpl
     DartType returnType = procedure.function.returnType;
 
     for (TypeParameter functionParameter in functionTypeParameters) {
-      // Coverage-ignore-block(suite): Not run.
       for (TypeParameter typeParameter in typeParameters) {
         Variance typeVariance = Variance.invariant
             .combine(computeVariance(typeParameter, functionParameter.bound));
@@ -1122,7 +1122,6 @@ class SourceClassBuilder extends ClassBuilderImpl
       }
     }
     for (VariableDeclaration formal in positionalParameters) {
-      // Coverage-ignore-block(suite): Not run.
       if (!formal.isCovariantByDeclaration) {
         for (TypeParameter typeParameter in typeParameters) {
           Variance formalVariance = Variance.contravariant
@@ -1133,7 +1132,6 @@ class SourceClassBuilder extends ClassBuilderImpl
       }
     }
     for (VariableDeclaration named in namedParameters) {
-      // Coverage-ignore-block(suite): Not run.
       for (TypeParameter typeParameter in typeParameters) {
         Variance namedVariance = Variance.contravariant
             .combine(computeVariance(typeParameter, named.type));