[cfe] Move check functionality to extension

This moves the check functionality from SourceLibraryBuilder to an extension on ProblemReporting.

These functions don't really have anything to do with the SourceLibraryBuilder other than it implements the ProblemReporting interface. This change makes it clear what the dependencies actually are.

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

Author: johnniwinther

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

@@ -105,3 +105,35 @@ class LibraryProblemReporting implements ProblemReporting {
   @override
   String toString() => '$runtimeType(fileUri=$_fileUri)';
 }
+
+abstract class ProblemReportingHelper {
+  /// Assert that a compile-time error was reported during [expectedPhase] of
+  /// compilation.
+  ///
+  /// The parameters [location] and [originalStackTrace] are supposed to help to
+  /// locate the place where the expectation was declared.
+  ///
+  /// To avoid spending resources on stack trace computations, it is recommended
+  /// to wrap the calls to [assertProblemReportedElsewhere] into `assert`s.
+  bool assertProblemReportedElsewhere(
+    String location, {
+    required CompilationPhaseForProblemReporting expectedPhase,
+  });
+}
+
+/// This enum is used to mark the expected compilation phase for a compile-time
+/// error to be reported.
+enum CompilationPhaseForProblemReporting {
+  /// The outline building phase.
+  ///
+  /// The outline building phase includes outline expressions, such as default
+  /// values of parameters, annotations, and initializers of top-level constant
+  /// fields.
+  outline,
+
+  /// The body building phase.
+  ///
+  /// The body building phase includes initializers of non-constant fields,
+  /// bodies of method, getters, setters, constructors, etc.
+  bodyBuilding,
+}

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

@@ -6,6 +6,7 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/type_environment.dart';
 
+import '../api_prototype/experimental_flags.dart';
 import '../builder/builder.dart';
 import '../builder/compilation_unit.dart';
 import '../builder/declaration_builders.dart';
@@ -505,7 +506,8 @@ mixin ErroneousMemberBuilderMixin implements SourceMemberBuilder {
   @override
   // Coverage-ignore(suite): Not run.
   void checkTypes(
-    SourceLibraryBuilder library,
+    ProblemReporting problemReporting,
+    LibraryFeatures libraryFeatures,
     NameSpace nameSpace,
     TypeEnvironment typeEnvironment,
   ) {

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

@@ -34,7 +34,8 @@ import '../base/messages.dart'
         codeSupertypeIsTypeParameter,
         codeTypeArgumentMismatch,
         codeTypeArgumentsOnTypeVariable,
-        codeTypeNotFound;
+        codeTypeNotFound,
+        CompilationPhaseForProblemReporting;
 import '../base/scope.dart';
 import '../base/uris.dart';
 import '../dill/dill_class_builder.dart';

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

@@ -27,6 +27,7 @@ import '../../kernel/body_builder.dart';
 import '../../kernel/body_builder_context.dart';
 import '../../kernel/kernel_helper.dart';
 import '../../kernel/type_algorithms.dart';
+import '../../source/check_helper.dart';
 import '../../source/name_scheme.dart';
 import '../../source/source_class_builder.dart';
 import '../../source/source_constructor_builder.dart';
@@ -85,7 +86,7 @@ abstract class ConstructorDeclaration {
   });
 
   void checkTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     NameSpace nameSpace,
     TypeEnvironment typeEnvironment,
   );
@@ -666,13 +667,13 @@ mixin _ConstructorDeclarationMixin
 
   @override
   void checkTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     NameSpace nameSpace,
     TypeEnvironment typeEnvironment,
   ) {
-    libraryBuilder.checkInitializersInFormals(
-      formals,
-      typeEnvironment,
+    problemReporting.checkInitializersInFormals(
+      formals: formals,
+      typeEnvironment: typeEnvironment,
       isAbstract: false,
       isExternal: isExternal,
     );
@@ -1473,7 +1474,7 @@ mixin _SyntheticConstructorDeclarationMixin implements ConstructorDeclaration {
 
   @override
   void checkTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     NameSpace nameSpace,
     TypeEnvironment typeEnvironment,
   ) {}

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

@@ -213,7 +213,7 @@ class EnumElementDeclaration
 
   @override
   void checkFieldTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   ) {}
@@ -227,7 +227,8 @@ class EnumElementDeclaration
 
   @override
   void checkGetterTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
+    LibraryFeatures libraryFeatures,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   ) {}

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

@@ -18,6 +18,7 @@ import '../../fragment/fragment.dart';
 import '../../kernel/body_builder_context.dart';
 import '../../kernel/kernel_helper.dart';
 import '../../kernel/type_algorithms.dart';
+import '../../source/check_helper.dart';
 import '../../source/name_scheme.dart';
 import '../../source/source_factory_builder.dart';
 import '../../source/source_function_builder.dart';
@@ -78,7 +79,7 @@ abstract class FactoryDeclaration {
   });
 
   void checkTypes(
-    SourceLibraryBuilder library,
+    ProblemReporting problemReporting,
     NameSpace nameSpace,
     TypeEnvironment typeEnvironment,
   );
@@ -285,17 +286,17 @@ class FactoryDeclarationImpl
 
   @override
   void checkTypes(
-    SourceLibraryBuilder library,
+    ProblemReporting problemReporting,
     NameSpace nameSpace,
     TypeEnvironment typeEnvironment,
   ) {
     if (_fragment.redirectionTarget != null) {
       // Default values are not required on redirecting factory constructors so
       // we don't call [checkInitializersInFormals].
     } else {
-      library.checkInitializersInFormals(
-        _fragment.formals,
-        typeEnvironment,
+      problemReporting.checkInitializersInFormals(
+        formals: _fragment.formals,
+        typeEnvironment: typeEnvironment,
         isAbstract: _fragment.modifiers.isAbstract,
         isExternal: _fragment.modifiers.isExternal,
       );

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

@@ -9,6 +9,7 @@ import 'package:kernel/type_environment.dart';
 
 import '../../base/identifiers.dart';
 import '../../base/lookup_result.dart';
+import '../../base/messages.dart';
 import '../../base/problems.dart' show unexpected, unhandled;
 import '../../builder/builder.dart';
 import '../../builder/constructor_builder.dart';
@@ -21,7 +22,6 @@ import '../../builder/named_type_builder.dart';
 import '../../builder/nullability_builder.dart';
 import '../../builder/omitted_type_builder.dart';
 import '../../builder/type_builder.dart';
-import '../../codes/cfe_codes.dart';
 import '../../dill/dill_extension_type_member_builder.dart';
 import '../../dill/dill_member_builder.dart';
 import '../../fragment/fragment.dart';
@@ -33,8 +33,7 @@ import '../../source/redirecting_factory_body.dart';
 import '../../source/source_factory_builder.dart';
 import '../../source/source_function_builder.dart';
 import '../../source/source_library_builder.dart' show SourceLibraryBuilder;
-import '../../source/source_loader.dart'
-    show CompilationPhaseForProblemReporting, SourceLoader;
+import '../../source/source_loader.dart' show SourceLoader;
 import '../../source/source_member_builder.dart';
 import '../../source/source_type_parameter_builder.dart';
 import '../../source/type_parameter_factory.dart';

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

@@ -9,6 +9,7 @@ import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/core_types.dart';
 import 'package:kernel/type_environment.dart';
 
+import '../../api_prototype/experimental_flags.dart';
 import '../../base/constant_context.dart';
 import '../../base/messages.dart';
 import '../../base/problems.dart';
@@ -21,6 +22,7 @@ import '../../builder/property_builder.dart';
 import '../../builder/type_builder.dart';
 import '../../kernel/body_builder.dart';
 import '../../kernel/body_builder_context.dart';
+import '../../source/check_helper.dart';
 import '../../kernel/hierarchy/class_member.dart';
 import '../../kernel/hierarchy/members_builder.dart';
 import '../../kernel/implicit_field_type.dart';
@@ -73,7 +75,7 @@ abstract class FieldDeclaration {
   void createFieldEncoding(SourcePropertyBuilder builder);
 
   void checkFieldTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   );
@@ -437,12 +439,12 @@ class RegularFieldDeclaration
 
   @override
   void checkFieldTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   ) {
-    libraryBuilder.checkTypesInField(
-      typeEnvironment,
+    problemReporting.checkTypesInField(
+      typeEnvironment: typeEnvironment,
       isInstanceMember: builder.isDeclarationInstanceMember,
       isLate: isLate,
       isExternal: _fragment.modifiers.isExternal,
@@ -745,7 +747,8 @@ class RegularFieldDeclaration
 
   @override
   void checkGetterTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
+    LibraryFeatures libraryFeatures,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   ) {}
@@ -758,7 +761,7 @@ class RegularFieldDeclaration
 
   @override
   void checkSetterTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
     TypeEnvironment typeEnvironment,
   ) {}
 

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

@@ -12,6 +12,7 @@ import 'package:kernel/transformations/flags.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
+import '../api_prototype/experimental_flags.dart';
 import '../api_prototype/lowering_predicates.dart';
 import '../base/constant_context.dart';
 import '../base/local_scope.dart';
@@ -33,6 +34,7 @@ import '../builder/type_builder.dart';
 import '../builder/variable_builder.dart';
 import '../kernel/body_builder.dart';
 import '../kernel/body_builder_context.dart';
+import '../source/check_helper.dart';
 import '../kernel/constness.dart';
 import '../kernel/expression_generator_helper.dart';
 import '../kernel/hierarchy/class_member.dart';

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

@@ -6,6 +6,7 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/type_environment.dart';
 
+import '../../api_prototype/experimental_flags.dart';
 import '../../base/local_scope.dart';
 import '../../base/messages.dart';
 import '../../base/scope.dart';
@@ -61,7 +62,8 @@ abstract class GetterDeclaration {
   });
 
   void checkGetterTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
+    LibraryFeatures libraryFeatures,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   );
@@ -198,12 +200,14 @@ class RegularGetterDeclaration
 
   @override
   void checkGetterTypes(
-    SourceLibraryBuilder libraryBuilder,
+    ProblemReporting problemReporting,
+    LibraryFeatures libraryFeatures,
     TypeEnvironment typeEnvironment,
     SourcePropertyBuilder? setterBuilder,
   ) {
     _encoding.checkTypes(
-      libraryBuilder,
+      problemReporting,
+      libraryFeatures,
       typeEnvironment,
       setterBuilder,
       isAbstract: _fragment.modifiers.isAbstract,