Version 3.4.0-183.0.dev

Merge 3c218ec into dev

pkg/dart2wasm/lib/ffi_native_transformer.dart

@@ -8,9 +8,10 @@ import 'package:kernel/core_types.dart';
 import 'package:kernel/library_index.dart' show LibraryIndex;
 import 'package:kernel/reference_from_index.dart' show ReferenceFromIndex;
 import 'package:kernel/target/targets.dart' show DiagnosticReporter;
-import 'package:vm/transformations/ffi/abi.dart' show Abi;
-import 'package:vm/transformations/ffi/common.dart' show NativeType;
-import 'package:vm/transformations/ffi/native.dart' show FfiNativeTransformer;
+import 'package:vm/modular/transformations/ffi/abi.dart' show Abi;
+import 'package:vm/modular/transformations/ffi/common.dart' show NativeType;
+import 'package:vm/modular/transformations/ffi/native.dart'
+    show FfiNativeTransformer;
 import 'abi.dart' show kWasmAbiEnumIndex;
 
 /// Transform `@Native`-annotated functions to convert Dart arguments to

pkg/dart2wasm/lib/target.dart

@@ -16,14 +16,14 @@ import 'package:kernel/target/changed_structure_notifier.dart';
 import 'package:kernel/target/targets.dart';
 import 'package:kernel/type_environment.dart';
 import 'package:kernel/verifier.dart';
-import 'package:vm/transformations/mixin_full_resolution.dart'
+import 'package:vm/modular/transformations/mixin_full_resolution.dart'
     as transformMixins show transformLibraries;
-import 'package:vm/transformations/ffi/common.dart' as ffiHelper
+import 'package:vm/modular/transformations/ffi/common.dart' as ffiHelper
     show calculateTransitiveImportsOfDartFfiIfUsed;
-import 'package:vm/transformations/ffi/definitions.dart'
+import 'package:vm/modular/transformations/ffi/definitions.dart'
     as transformFfiDefinitions show transformLibraries;
-import 'package:vm/transformations/ffi/use_sites.dart' as transformFfiUseSites
-    show transformLibraries;
+import 'package:vm/modular/transformations/ffi/use_sites.dart'
+    as transformFfiUseSites show transformLibraries;
 import 'package:front_end/src/api_prototype/constant_evaluator.dart'
     as constantEvaluator show ConstantEvaluator, EvaluationMode;
 import 'package:front_end/src/api_prototype/const_conditional_simplifier.dart'

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -39,6 +39,7 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/clone.dart';
 import 'package:kernel/core_types.dart';
+import 'package:kernel/names.dart' show emptyName, minusName, plusName;
 import 'package:kernel/src/bounds_checks.dart' hide calculateBounds;
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
@@ -82,7 +83,6 @@ import '../identifiers.dart'
         flattenName;
 import '../modifier.dart'
     show Modifier, constMask, covariantMask, finalMask, lateMask, requiredMask;
-import '../names.dart' show emptyName, minusName, plusName;
 import '../problems.dart' show internalProblem, unhandled, unsupported;
 import '../scope.dart';
 import '../source/diet_parser.dart';

pkg/front_end/lib/src/fasta/kernel/constructor_tearoff_lowering.dart

@@ -3,93 +3,16 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:kernel/ast.dart';
+import 'package:kernel/constructor_tearoff_lowering.dart';
 import 'package:kernel/type_algebra.dart';
 
 import '../builder/library_builder.dart';
 import '../source/name_scheme.dart';
 import '../source/source_library_builder.dart';
 import 'kernel_helper.dart';
 
-const String _tearOffNamePrefix = '_#';
-const String _tearOffNameSuffix = '#tearOff';
-
-/// Creates the synthesized name to use for the lowering of the tear off of a
-/// constructor or factory by the given [name].
-String constructorTearOffName(String name) {
-  return '$_tearOffNamePrefix'
-      '${name.isEmpty ? 'new' : name}'
-      '$_tearOffNameSuffix';
-}
-
-/// Creates the synthesized name to use for the lowering of the tear off of a
-/// constructor or factory by the given [constructorName] through a typedef by
-/// the given [typedefName].
-String typedefTearOffName(String typedefName, String constructorName) {
-  return '$_tearOffNamePrefix'
-      '$typedefName#'
-      '${constructorName.isEmpty ? 'new' : constructorName}'
-      '$_tearOffNameSuffix';
-}
-
-/// Returns the name of the corresponding constructor or factory if [name] is
-/// the synthesized name of a lowering of the tear off of a constructor or
-/// factory. Returns `null` otherwise.
-String? extractConstructorNameFromTearOff(Name name) {
-  if (name.text.startsWith(_tearOffNamePrefix) &&
-      name.text.endsWith(_tearOffNameSuffix) &&
-      name.text.length >
-          _tearOffNamePrefix.length + _tearOffNameSuffix.length) {
-    String text =
-        name.text.substring(0, name.text.length - _tearOffNameSuffix.length);
-    text = text.substring(_tearOffNamePrefix.length);
-    if (text.contains('#')) {
-      return null;
-    }
-    return text == 'new' ? '' : text;
-  }
-  return null;
-}
-
-/// If [name] is the synthesized name of a lowering of a typedef tear off, a
-/// list containing the [String] name of the typedef and the [Name] name of the
-/// corresponding constructor or factory is returned. Returns `null` otherwise.
-List<Object>? extractTypedefNameFromTearOff(Name name) {
-  if (name.text.startsWith(_tearOffNamePrefix) &&
-      name.text.endsWith(_tearOffNameSuffix) &&
-      name.text.length >
-          _tearOffNamePrefix.length + _tearOffNameSuffix.length) {
-    String text =
-        name.text.substring(0, name.text.length - _tearOffNameSuffix.length);
-    text = text.substring(_tearOffNamePrefix.length);
-    int hashIndex = text.indexOf('#');
-    if (hashIndex == -1) {
-      return null;
-    }
-    String typedefName = text.substring(0, hashIndex);
-    String constructorName = text.substring(hashIndex + 1);
-    constructorName = constructorName == 'new' ? '' : constructorName;
-    return [typedefName, new Name(constructorName, name.library)];
-  }
-  return null;
-}
-
-/// Returns `true` if [member] is a lowered constructor, factory or typedef tear
-/// off.
-bool isTearOffLowering(Member member) {
-  return member is Procedure &&
-      (isConstructorTearOffLowering(member) ||
-          isTypedefTearOffLowering(member));
-}
-
-/// Returns `true` if [procedure] is a lowered constructor or factory tear off.
-bool isConstructorTearOffLowering(Procedure procedure) {
-  return extractConstructorNameFromTearOff(procedure.name) != null;
-}
-
-/// Returns `true` if [procedure] is a lowered typedef tear off.
-bool isTypedefTearOffLowering(Procedure procedure) {
-  return extractTypedefNameFromTearOff(procedure.name) != null;
-}
+// TODO(johnniwinther): move all lowering predicates to `package:kernel`.
+export 'package:kernel/constructor_tearoff_lowering.dart';
 
 /// Creates the [Procedure] for the lowering of a generative constructor of
 /// the given [name] in [compilationUnit].

pkg/front_end/lib/src/fasta/kernel/expression_generator.dart

@@ -9,22 +9,7 @@ import 'package:_fe_analyzer_shared/src/parser/parser.dart'
     show lengthForToken, lengthOfSpan;
 import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
 import 'package:kernel/ast.dart';
-import 'package:kernel/src/unaliasing.dart';
-import 'package:kernel/text/ast_to_text.dart';
-import 'package:kernel/type_algebra.dart';
-
-import '../builder/builder.dart';
-import '../builder/declaration_builders.dart';
-import '../builder/library_builder.dart';
-import '../builder/member_builder.dart';
-import '../builder/named_type_builder.dart';
-import '../builder/nullability_builder.dart';
-import '../builder/omitted_type_builder.dart';
-import '../builder/prefix_builder.dart';
-import '../builder/type_builder.dart';
-import '../constant_context.dart' show ConstantContext;
-import '../fasta_codes.dart';
-import '../names.dart'
+import 'package:kernel/names.dart'
     show
         ampersandName,
         barName,
@@ -43,6 +28,21 @@ import '../names.dart'
         plusName,
         rightShiftName,
         tripleShiftName;
+import 'package:kernel/src/unaliasing.dart';
+import 'package:kernel/text/ast_to_text.dart';
+import 'package:kernel/type_algebra.dart';
+
+import '../builder/builder.dart';
+import '../builder/declaration_builders.dart';
+import '../builder/library_builder.dart';
+import '../builder/member_builder.dart';
+import '../builder/named_type_builder.dart';
+import '../builder/nullability_builder.dart';
+import '../builder/omitted_type_builder.dart';
+import '../builder/prefix_builder.dart';
+import '../builder/type_builder.dart';
+import '../constant_context.dart' show ConstantContext;
+import '../fasta_codes.dart';
 import '../problems.dart';
 import '../scope.dart';
 import '../source/source_member_builder.dart';

pkg/front_end/lib/src/fasta/kernel/forwarding_node.dart

@@ -4,14 +4,13 @@
 
 import "package:kernel/ast.dart";
 import 'package:kernel/core_types.dart';
+import 'package:kernel/names.dart';
 import 'package:kernel/reference_from_index.dart';
-
 import 'package:kernel/transformations/flags.dart' show TransformerFlag;
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
 import '../builder/declaration_builders.dart';
-import '../names.dart';
 
 import "../problems.dart" show unhandled;
 

pkg/front_end/lib/src/fasta/kernel/hierarchy/members_node.dart

@@ -9,6 +9,7 @@ import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 import 'package:kernel/src/legacy_erasure.dart';
 import 'package:kernel/src/nnbd_top_merge.dart';
 import 'package:kernel/src/norm.dart';
+import 'package:kernel/names.dart' show noSuchMethodName;
 
 import '../../../base/common.dart';
 import '../../builder/declaration_builders.dart';
@@ -37,7 +38,6 @@ import '../../messages.dart'
         templateInstanceAndSynthesizedStaticConflict,
         templateMissingImplementationCause,
         templateMissingImplementationNotAbstract;
-import '../../names.dart' show noSuchMethodName;
 import '../../source/source_class_builder.dart';
 import '../../source/source_field_builder.dart';
 import '../../source/source_procedure_builder.dart';

pkg/front_end/lib/src/fasta/kernel/internal_ast.dart

@@ -18,6 +18,7 @@
 /// kernel class, because multiple constructs in Dart may desugar to a tree
 /// with the same kind of root node.
 import 'package:kernel/ast.dart';
+import 'package:kernel/names.dart';
 import 'package:kernel/src/printer.dart';
 import 'package:kernel/text/ast_to_text.dart' show Precedence;
 import 'package:kernel/type_environment.dart';
@@ -26,7 +27,6 @@ import 'package:_fe_analyzer_shared/src/type_inference/type_analysis_result.dart
     as shared;
 
 import '../builder/declaration_builders.dart';
-import '../names.dart';
 import '../problems.dart' show unsupported;
 import '../type_inference/inference_visitor.dart';
 import '../type_inference/inference_results.dart';

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

@@ -8,6 +8,7 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart'
     show ClassHierarchy, ClassHierarchyBase, ClassHierarchyMembers;
 import 'package:kernel/core_types.dart';
+import 'package:kernel/names.dart' show equalsName;
 import 'package:kernel/reference_from_index.dart' show IndexedContainer;
 import 'package:kernel/src/bounds_checks.dart';
 import 'package:kernel/src/legacy_erasure.dart';
@@ -40,7 +41,6 @@ import '../kernel/hierarchy/hierarchy_node.dart';
 import '../kernel/kernel_helper.dart';
 import '../kernel/type_algorithms.dart' show computeTypeVariableBuilderVariance;
 import '../kernel/utils.dart' show compareProcedures;
-import '../names.dart' show equalsName;
 import '../problems.dart' show unexpected, unhandled, unimplemented;
 import '../scope.dart';
 import '../util/helpers.dart';

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -17,6 +17,7 @@ import 'package:kernel/ast.dart' hide Combinator, MapLiteralEntry;
 import 'package:kernel/class_hierarchy.dart'
     show ClassHierarchy, ClassHierarchyBase, ClassHierarchyMembers;
 import 'package:kernel/clone.dart' show CloneVisitorNotMembers;
+import 'package:kernel/names.dart' show indexSetName;
 import 'package:kernel/reference_from_index.dart'
     show IndexedClass, IndexedContainer, IndexedLibrary;
 import 'package:kernel/src/bounds_checks.dart'
@@ -99,7 +100,6 @@ import '../modifier.dart'
         mixinDeclarationMask,
         namedMixinApplicationMask,
         staticMask;
-import '../names.dart' show indexSetName;
 import '../problems.dart' show unexpected, unhandled;
 import '../scope.dart';
 import '../util/helpers.dart';

pkg/front_end/lib/src/fasta/type_inference/external_ast_helper.dart

@@ -6,9 +6,9 @@
 
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
+import 'package:kernel/names.dart';
 
 import '../kernel/internal_ast.dart';
-import '../names.dart';
 import 'inference_results.dart';
 import 'inference_visitor_base.dart';
 import 'object_access_target.dart';

pkg/front_end/lib/src/fasta/type_inference/inference_visitor.dart

@@ -17,6 +17,7 @@ import 'package:_fe_analyzer_shared/src/util/stack_checker.dart';
 import 'package:_fe_analyzer_shared/src/util/value_kind.dart';
 import 'package:front_end/src/api_prototype/lowering_predicates.dart';
 import 'package:kernel/ast.dart';
+import 'package:kernel/names.dart';
 import 'package:kernel/src/legacy_erasure.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
@@ -46,7 +47,6 @@ import '../kernel/hierarchy/class_member.dart';
 import '../kernel/implicit_type_argument.dart' show ImplicitTypeArgument;
 import '../kernel/internal_ast.dart';
 import '../kernel/late_lowering.dart' as late_lowering;
-import '../names.dart';
 import '../problems.dart' as problems
     show internalProblem, unhandled, unsupported;
 import '../source/constructor_declaration.dart';

pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart

@@ -19,6 +19,7 @@ import 'package:kernel/src/future_value_type.dart';
 import 'package:kernel/src/legacy_erasure.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
+import 'package:kernel/names.dart';
 
 import '../../api_prototype/experimental_flags.dart';
 import '../../base/instrumentation.dart'
@@ -38,7 +39,6 @@ import '../kernel/hierarchy/class_member.dart';
 import '../kernel/internal_ast.dart';
 import '../kernel/kernel_helper.dart';
 import '../kernel/type_algorithms.dart' show hasAnyTypeVariables;
-import '../names.dart';
 import '../problems.dart' show internalProblem, unhandled;
 import '../source/source_constructor_builder.dart';
 import '../source/source_field_builder.dart';

pkg/front_end/lib/src/fasta/type_inference/matching_cache.dart

@@ -4,11 +4,11 @@
 
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
+import 'package:kernel/names.dart';
 import 'package:kernel/src/printer.dart';
 import 'package:kernel/type_environment.dart';
 
 import '../../api_unstable/util.dart';
-import '../names.dart';
 import '../type_inference/external_ast_helper.dart';
 import 'delayed_expressions.dart';
 import 'type_schema.dart';

pkg/front_end/lib/src/fasta/type_inference/matching_expressions.dart

@@ -7,9 +7,9 @@ import 'package:front_end/src/fasta/type_inference/external_ast_helper.dart';
 import 'package:front_end/src/fasta/type_inference/matching_cache.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
+import 'package:kernel/names.dart';
 
 import '../../api_prototype/constant_evaluator.dart';
-import '../names.dart';
 
 /// Visitor that creates the [DelayedExpression] needed to match expressions,
 /// using [MatchingCache] to create cacheable expressions.

pkg/front_end/lib/src/fasta/type_inference/type_constraint_gatherer.dart

@@ -8,7 +8,7 @@ import 'package:kernel/type_algebra.dart';
 
 import 'package:kernel/type_environment.dart';
 
-import '../names.dart' show callName;
+import 'package:kernel/names.dart' show callName;
 
 import 'type_inference_engine.dart';
 

pkg/front_end/test/async_but_no_await_git_test.dart

@@ -19,7 +19,7 @@ import 'package:kernel/kernel.dart';
 import 'package:kernel/reference_from_index.dart';
 import 'package:kernel/target/changed_structure_notifier.dart';
 import 'package:kernel/target/targets.dart';
-import "package:vm/target/vm.dart" show VmTarget;
+import "package:vm/modular/target/vm.dart" show VmTarget;
 
 import 'testing_utils.dart' show getGitFiles;
 import "utils/io_utils.dart";

pkg/front_end/test/comments_on_certain_arguments_tool.dart

@@ -48,7 +48,7 @@ import 'package:kernel/ast.dart';
 
 import 'package:kernel/target/targets.dart' show TargetFlags;
 
-import "package:vm/target/vm.dart" show VmTarget;
+import "package:vm/modular/target/vm.dart" show VmTarget;
 
 import "utils/io_utils.dart" show computeRepoDirUri;
 

pkg/front_end/test/compiler_test_helper.dart

@@ -30,7 +30,7 @@ import 'package:kernel/core_types.dart';
 import 'package:kernel/kernel.dart';
 import 'package:kernel/target/targets.dart';
 import 'package:testing/testing.dart';
-import "package:vm/target/vm.dart" show VmTarget;
+import "package:vm/modular/target/vm.dart" show VmTarget;
 
 api.CompilerOptions getOptions(
     {void Function(api.DiagnosticMessage message)? onDiagnostic,

pkg/front_end/test/constant_evaluator_benchmark.dart

@@ -29,8 +29,8 @@ import 'package:kernel/target/changed_structure_notifier.dart';
 import 'package:kernel/target/targets.dart'
     show DiagnosticReporter, Target, TargetFlags;
 import 'package:kernel/type_environment.dart';
-import "package:vm/target/flutter.dart" show FlutterTarget;
-import "package:vm/target/vm.dart" show VmTarget;
+import "package:vm/modular/target/flutter.dart" show FlutterTarget;
+import "package:vm/modular/target/vm.dart" show VmTarget;
 
 import 'incremental_suite.dart' show getOptions;