[cfe] Simplify _endClassMethod into _endClassMethod/_endClassConstructor

This splits the implementation of _endClassMethod into _endClassMethod which handles method declarations and _endClassConstructor which handles constructor declarations. Unused parts in both are removed.

Change-Id: Ia9f3dda230840686d57369284a57cd37c3dd671d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/460400
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

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

@@ -856,14 +856,7 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      false,
-    );
+    _endClassMethod(getOrSet, beginToken, beginParam);
   }
 
   @override
@@ -874,14 +867,7 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      true,
-    );
+    _endClassConstructor(beginToken, beginParam);
   }
 
   @override
@@ -892,14 +878,7 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      false,
-    );
+    _endClassMethod(getOrSet, beginToken, beginParam);
   }
 
   @override
@@ -920,14 +899,7 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      false,
-    );
+    _endClassMethod(getOrSet, beginToken, beginParam);
   }
 
   @override
@@ -938,24 +910,10 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      true,
-    );
+    _endClassConstructor(beginToken, beginParam);
   }
 
-  void _endClassMethod(
-    Token? getOrSet,
-    Token beginToken,
-    Token beginParam,
-    Token? beginInitializers,
-    Token endToken,
-    bool isConstructor,
-  ) {
+  void _endClassMethod(Token? getOrSet, Token beginToken, Token beginParam) {
     debugEvent("Method");
     assert(
       checkState(beginToken, [
@@ -975,22 +933,18 @@ class DietListener extends StackListenerImpl {
     Identifier identifier = name as Identifier;
 
     FunctionFragment functionFragment;
-    if (isConstructor) {
-      functionFragment = _offsetMap.lookupConstructor(identifier);
-    } else {
-      ProcedureKind kind = computeProcedureKind(getOrSet);
-      switch (kind) {
-        case ProcedureKind.Method:
-        case ProcedureKind.Operator:
-          functionFragment = _offsetMap.lookupMethod(identifier);
-        case ProcedureKind.Getter:
-          functionFragment = _offsetMap.lookupGetter(identifier);
-        case ProcedureKind.Setter:
-          functionFragment = _offsetMap.lookupSetter(identifier);
-        // Coverage-ignore(suite): Not run.
-        case ProcedureKind.Factory:
-          throw new UnsupportedError("Unexpected procedure kind: $kind");
-      }
+    ProcedureKind kind = computeProcedureKind(getOrSet);
+    switch (kind) {
+      case ProcedureKind.Method:
+      case ProcedureKind.Operator:
+        functionFragment = _offsetMap.lookupMethod(identifier);
+      case ProcedureKind.Getter:
+        functionFragment = _offsetMap.lookupGetter(identifier);
+      case ProcedureKind.Setter:
+        functionFragment = _offsetMap.lookupSetter(identifier);
+      // Coverage-ignore(suite): Not run.
+      case ProcedureKind.Factory:
+        throw new UnsupportedError("Unexpected procedure kind: $kind");
     }
     FunctionBodyBuildingContext functionBodyBuildingContext = functionFragment
         .createFunctionBodyBuildingContext();
@@ -999,6 +953,35 @@ class DietListener extends StackListenerImpl {
     }
   }
 
+  void _endClassConstructor(Token beginToken, Token beginParam) {
+    debugEvent("Method");
+    assert(
+      checkState(beginToken, [
+        /* bodyToken */ ValueKinds.Token,
+        /* name */ ValueKinds.IdentifierOrParserRecovery,
+        /* metadata token */ ValueKinds.TokenOrNull,
+      ]),
+    );
+    // TODO(danrubel): Consider removing the beginParam parameter
+    // and using bodyToken, but pushing a NullValue on the stack
+    // in handleNoFormalParameters rather than the supplied token.
+    pop(); // bodyToken
+    Object? name = pop();
+    Token? metadata = pop() as Token?;
+    checkEmpty(beginToken.charOffset);
+    if (name is ParserRecovery || currentClassIsParserRecovery) return;
+    Identifier identifier = name as Identifier;
+
+    FunctionFragment functionFragment = _offsetMap.lookupConstructor(
+      identifier,
+    );
+    FunctionBodyBuildingContext functionBodyBuildingContext = functionFragment
+        .createFunctionBodyBuildingContext();
+    if (functionBodyBuildingContext.shouldBuild) {
+      buildFunctionBody(functionBodyBuildingContext, beginParam, metadata);
+    }
+  }
+
   void _buildFields(int count, Token token, bool isTopLevel) {
     assert(
       checkState(
@@ -1319,14 +1302,7 @@ class DietListener extends StackListenerImpl {
     Token endToken,
   ) {
     debugEvent("endExtensionTypeConstructor");
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      true,
-    );
+    _endClassConstructor(beginToken, beginParam);
   }
 
   @override
@@ -1338,14 +1314,7 @@ class DietListener extends StackListenerImpl {
     Token endToken,
   ) {
     debugEvent("endExtensionTypeFactoryMethod");
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      false,
-    );
+    _endClassMethod(getOrSet, beginToken, beginParam);
   }
 
   @override
@@ -1420,14 +1389,7 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      true,
-    );
+    _endClassConstructor(beginToken, beginParam);
   }
 
   @override
@@ -1438,14 +1400,7 @@ class DietListener extends StackListenerImpl {
     Token? beginInitializers,
     Token endToken,
   ) {
-    _endClassMethod(
-      getOrSet,
-      beginToken,
-      beginParam,
-      beginInitializers,
-      endToken,
-      false,
-    );
+    _endClassMethod(getOrSet, beginToken, beginParam);
   }
 
   @override

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

@@ -324,23 +324,20 @@ abstract class FragmentFactory {
     required int nameOffset,
     required int formalsOffset,
     required Modifiers modifiers,
-    required bool inConstructor,
     required bool isStatic,
-    required bool isConstructor,
     required bool forAbstractClassOrMixin,
     required bool isExtensionMember,
     required bool isExtensionTypeMember,
     required AsyncMarker asyncModifier,
     required String? nativeMethodName,
-    required ProcedureKind? kind,
+    required ProcedureKind kind,
   });
 
   void addConstructor({
     required OffsetMap offsetMap,
     required List<MetadataBuilder>? metadata,
     required Modifiers modifiers,
     required Identifier identifier,
-    required ConstructorName constructorName,
     required List<TypeParameterFragment>? typeParameters,
     required List<FormalParameterBuilder>? formals,
     required int startOffset,