[cfe] Pass type parameter scope to function fragments

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

Author: johnniwinther

pkg/front_end/lib/src/fragment/constructor.dart

@@ -15,6 +15,7 @@ class ConstructorFragment implements Fragment, FunctionFragment {
   final List<MetadataBuilder>? metadata;
   final OmittedTypeBuilder returnType;
   final List<NominalParameterBuilder>? typeParameters;
+  final LookupScope typeParameterScope;
   final List<FormalParameterBuilder>? formals;
   final String? nativeMethodName;
   final bool forAbstractClassOrMixin;
@@ -33,6 +34,7 @@ class ConstructorFragment implements Fragment, FunctionFragment {
       required this.metadata,
       required this.returnType,
       required this.typeParameters,
+      required this.typeParameterScope,
       required this.formals,
       required this.nativeMethodName,
       required this.forAbstractClassOrMixin,
@@ -92,8 +94,8 @@ class _ConstructorBodyBuildingContext implements FunctionBodyBuildingContext {
   }
 
   @override
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope) {
-    return _fragment.builder.computeTypeParameterScope(enclosingScope);
+  LookupScope get typeParameterScope {
+    return _fragment.typeParameterScope;
   }
 
   @override

pkg/front_end/lib/src/fragment/factory.dart

@@ -15,6 +15,7 @@ class FactoryFragment implements Fragment, FunctionFragment {
   final List<MetadataBuilder>? metadata;
   final TypeBuilder returnType;
   final List<NominalParameterBuilder>? typeParameters;
+  final LookupScope typeParameterScope;
   final List<FormalParameterBuilder>? formals;
   final AsyncMarker asyncModifier;
   final String? nativeMethodName;
@@ -33,6 +34,7 @@ class FactoryFragment implements Fragment, FunctionFragment {
       required this.metadata,
       required this.returnType,
       required this.typeParameters,
+      required this.typeParameterScope,
       required this.formals,
       required this.asyncModifier,
       required this.nativeMethodName,
@@ -76,8 +78,8 @@ class _FactoryBodyBuildingContext implements FunctionBodyBuildingContext {
   }
 
   @override
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope) {
-    return _fragment.builder.computeTypeParameterScope(enclosingScope);
+  LookupScope get typeParameterScope {
+    return _fragment.typeParameterScope;
   }
 
   @override

pkg/front_end/lib/src/fragment/function.dart

@@ -23,7 +23,7 @@ abstract class FunctionBodyBuildingContext {
       required bool inMetadata,
       required bool inConstFields});
 
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope);
+  LookupScope get typeParameterScope;
 
   LocalScope computeFormalParameterScope(LookupScope typeParameterScope);
 

pkg/front_end/lib/src/fragment/getter.dart

@@ -16,6 +16,7 @@ class GetterFragment implements Fragment, FunctionFragment {
   final Modifiers modifiers;
   final TypeBuilder returnType;
   final List<NominalParameterBuilder>? typeParameters;
+  final LookupScope typeParameterScope;
   final List<FormalParameterBuilder>? formals;
   final AsyncMarker asyncModifier;
   final String? nativeMethodName;
@@ -34,6 +35,7 @@ class GetterFragment implements Fragment, FunctionFragment {
       required this.modifiers,
       required this.returnType,
       required this.typeParameters,
+      required this.typeParameterScope,
       required this.formals,
       required this.asyncModifier,
       required this.nativeMethodName});
@@ -79,8 +81,8 @@ class _GetterBodyBuildingContext implements FunctionBodyBuildingContext {
   }
 
   @override
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope) {
-    return _fragment.builder.computeTypeParameterScope(enclosingScope);
+  LookupScope get typeParameterScope {
+    return _fragment.typeParameterScope;
   }
 
   @override

pkg/front_end/lib/src/fragment/method.dart

@@ -16,6 +16,7 @@ class MethodFragment implements Fragment, FunctionFragment {
   final Modifiers modifiers;
   final TypeBuilder returnType;
   final List<NominalParameterBuilder>? typeParameters;
+  final LookupScope typeParameterScope;
   final List<FormalParameterBuilder>? formals;
   final ProcedureKind kind;
   final AsyncMarker asyncModifier;
@@ -35,6 +36,7 @@ class MethodFragment implements Fragment, FunctionFragment {
       required this.modifiers,
       required this.returnType,
       required this.typeParameters,
+      required this.typeParameterScope,
       required this.formals,
       required this.kind,
       required this.asyncModifier,
@@ -81,8 +83,8 @@ class _MethodBodyBuildingContext implements FunctionBodyBuildingContext {
   }
 
   @override
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope) {
-    return _fragment.builder.computeTypeParameterScope(enclosingScope);
+  LookupScope get typeParameterScope {
+    return _fragment.typeParameterScope;
   }
 
   @override

pkg/front_end/lib/src/fragment/primary_constructor.dart

@@ -13,6 +13,7 @@ class PrimaryConstructorFragment implements Fragment, FunctionFragment {
   final Modifiers modifiers;
   final OmittedTypeBuilder returnType;
   final List<NominalParameterBuilder>? typeParameters;
+  final LookupScope typeParameterScope;
   final List<FormalParameterBuilder>? formals;
   final bool forAbstractClassOrMixin;
   Token? _beginInitializers;
@@ -28,6 +29,7 @@ class PrimaryConstructorFragment implements Fragment, FunctionFragment {
       required this.modifiers,
       required this.returnType,
       required this.typeParameters,
+      required this.typeParameterScope,
       required this.formals,
       required this.forAbstractClassOrMixin,
       required Token? beginInitializers})
@@ -84,8 +86,8 @@ class _PrimaryConstructorBodyBuildingContext
   }
 
   @override
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope) {
-    return _fragment.builder.computeTypeParameterScope(enclosingScope);
+  LookupScope get typeParameterScope {
+    return _fragment.typeParameterScope;
   }
 
   @override

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

@@ -16,6 +16,7 @@ class SetterFragment implements Fragment, FunctionFragment {
   final Modifiers modifiers;
   final TypeBuilder returnType;
   final List<NominalParameterBuilder>? typeParameters;
+  final LookupScope typeParameterScope;
   final List<FormalParameterBuilder>? formals;
   final AsyncMarker asyncModifier;
   final String? nativeMethodName;
@@ -34,6 +35,7 @@ class SetterFragment implements Fragment, FunctionFragment {
       required this.modifiers,
       required this.returnType,
       required this.typeParameters,
+      required this.typeParameterScope,
       required this.formals,
       required this.asyncModifier,
       required this.nativeMethodName});
@@ -79,8 +81,8 @@ class _SetterBodyBuildingContext implements FunctionBodyBuildingContext {
   }
 
   @override
-  LookupScope computeTypeParameterScope(LookupScope enclosingScope) {
-    return _fragment.builder.computeTypeParameterScope(enclosingScope);
+  LookupScope get typeParameterScope {
+    return _fragment.typeParameterScope;
   }
 
   @override

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

@@ -137,8 +137,6 @@ abstract class BuilderFactory {
 
   void beginFactoryMethod();
 
-  void endFactoryMethod();
-
   void endFactoryMethodForParserRecovery();
 
   void beginFunctionType();
@@ -147,29 +145,21 @@ abstract class BuilderFactory {
 
   void beginConstructor();
 
-  void endConstructor();
-
   void endConstructorForParserRecovery(
       List<NominalParameterBuilder>? typeParameters);
 
   void beginStaticMethod();
 
-  void endStaticMethod();
-
   void endStaticMethodForParserRecovery(
       List<NominalParameterBuilder>? typeParameters);
 
   void beginInstanceMethod();
 
-  void endInstanceMethod();
-
   void endInstanceMethodForParserRecovery(
       List<NominalParameterBuilder>? typeParameters);
 
   void beginTopLevelMethod();
 
-  void endTopLevelMethod();
-
   void endTopLevelMethodForParserRecovery(
       List<NominalParameterBuilder>? typeParameters);
 

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

@@ -904,7 +904,7 @@ class DietListener extends StackListenerImpl {
       required bool inMetadata,
       required bool inConstFields}) {
     final LookupScope typeParameterScope =
-        functionBodyBuildingContext.computeTypeParameterScope(memberScope);
+        functionBodyBuildingContext.typeParameterScope;
     final LocalScope formalParameterScope = functionBodyBuildingContext
         .computeFormalParameterScope(typeParameterScope);
     return createListener(

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

@@ -1750,7 +1750,6 @@ class OutlineBuilder extends StackListenerImpl {
     List<MetadataBuilder>? metadata = pop() as List<MetadataBuilder>?;
     checkEmpty(beginToken.charOffset);
     if (identifier is Identifier) {
-      _builderFactory.endTopLevelMethod();
       final int startOffset = metadata?.first.atOffset ?? beginToken.charOffset;
       int nameOffset = identifier.nameOffset;
       int endOffset = endToken.charOffset;