Version 3.7.0-277.0.dev

Merge 7a5174a into dev

BUILD.gn

@@ -1,6 +1,6 @@
 # Copyright (c) 2016, 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.
+# BSD-style license that can be found in the LICENSE file.
 
 import("build/config/gclient_args.gni")
 import("sdk_args.gni")
@@ -56,6 +56,16 @@ group("runtime") {
     "utils/dartdev:dartdev",
     "utils/kernel-service:kernel-service",
   ]
+
+  # The following dependencies allow dartdev to start the resident frontend
+  # server.
+  if (dart_target_arch != "ia32" && dart_target_arch != "x86") {
+    deps += [ "utils/kernel-service:frontend_server_aot_product" ]
+    deps += [ "runtime/bin:dartaotruntime_product" ]
+  } else {
+    deps += [ "utils/kernel-service:frontend_server" ]
+  }
+
   if (!is_win) {
     # The test isn't run on windows
     deps += [ "runtime/bin:entrypoints_verification_test" ]

DEPS

@@ -143,7 +143,7 @@ vars = {
   "markdown_rev": "4d5dbc659955973902f2585c54e94d453532db70",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental.
-  "native_rev": "4d81ce6c5e17164ef63d8a3f5144e5def0702207", # disable tools/rev_sdk_deps.dart
+  "native_rev": "7adf6bfa33e6042ffd9ae45f505bae30c6ee1fa6", # disable tools/rev_sdk_deps.dart
   "package_config_rev": "76f2f6c245451da1fa24d7bbb00251b909e729a5",
   "pool_rev": "f85209d83cb0aa3c5612ed80de32df51ba580abd",
   "protobuf_rev": "da7279c56734cffed4deb1e3a6f93bdcefccf6b8",

pkg/analyzer/analyzer_use_new_elements.txt

@@ -18,7 +18,6 @@ lib/src/dart/analysis/search.dart
 lib/src/dart/analysis/session.dart
 lib/src/dart/analysis/session_helper.dart
 lib/src/dart/ast/ast.dart
-lib/src/dart/ast/constant_evaluator.dart
 lib/src/dart/ast/element_locator.dart
 lib/src/dart/ast/extensions.dart
 lib/src/dart/ast/utilities.dart
@@ -39,7 +38,6 @@ lib/src/dart/element/least_greatest_closure.dart
 lib/src/dart/element/least_upper_bound.dart
 lib/src/dart/element/member.dart
 lib/src/dart/element/name_union.dart
-lib/src/dart/element/non_covariant_type_parameter_position.dart
 lib/src/dart/element/normalize.dart
 lib/src/dart/element/replace_top_bottom_visitor.dart
 lib/src/dart/element/replacement_visitor.dart
@@ -170,15 +168,13 @@ test/src/dart/analysis/session_test.dart
 test/src/dart/ast/element_locator_test.dart
 test/src/dart/constant/evaluation_test.dart
 test/src/dart/constant/value_test.dart
-test/src/dart/element/display_string_test.dart
 test/src/dart/element/element_test.dart
 test/src/dart/element/function_type_test.dart
 test/src/dart/element/generic_inferrer_test.dart
 test/src/dart/element/inheritance_manager3_test.dart
 test/src/dart/element/least_greatest_closure_test.dart
 test/src/dart/element/least_upper_bound_helper_test.dart
 test/src/dart/element/name_union_test.dart
-test/src/dart/element/non_covariant_type_parameter_position_test.dart
 test/src/dart/element/normalize_type_test.dart
 test/src/dart/element/nullable_test.dart
 test/src/dart/element/runtime_type_equality_test.dart
@@ -198,21 +194,18 @@ test/src/dart/resolution/prefix_element_test.dart
 test/src/dart/resolution/resolution.dart
 test/src/dart/resolution/scope_test.dart
 test/src/dart/resolution/super_formal_parameter_test.dart
-test/src/services/top_level_declarations_test.dart
 test/src/summary/element_text.dart
 test/src/summary/elements/class_test.dart
 test/src/summary/elements/enum_test.dart
 test/src/summary/elements/extension_type_test.dart
 test/src/summary/elements/metadata_test.dart
-test/src/summary/elements/since_sdk_version_test.dart
 test/src/summary/elements/top_level_function_test.dart
 test/src/summary/elements/top_level_variable_test.dart
 test/src/summary/elements/type_alias_test.dart
 test/src/summary/elements/type_inference_test.dart
 test/src/summary/elements_base.dart
 test/src/summary/macro_test.dart
 test/src/summary/resolved_ast_printer.dart
-test/src/summary/top_level_inference_test.dart
 test/src/task/strong/dart2_inference_test.dart
 test/src/task/strong/inferred_type_test.dart
 test/src/utilities/extensions/analysis_session_test.dart

pkg/analyzer/lib/src/dart/ast/constant_evaluator.dart

@@ -7,7 +7,7 @@ import 'dart:collection';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 
 /// Instances of the class [ConstantEvaluator] evaluate constant expressions to
 /// produce their compile-time value.
@@ -391,7 +391,7 @@ class ConstantEvaluator extends GeneralizingAstVisitor<Object> {
 
   /// Return the constant value of the static constant represented by the given
   /// [element].
-  Object _getConstantValue(Element? element) {
+  Object _getConstantValue(Element2? element) {
     // TODO(brianwilkerson): Implement this
 //    if (element is FieldElement) {
 //      FieldElement field = element;

pkg/analyzer/lib/src/dart/element/non_covariant_type_parameter_position.dart

@@ -4,13 +4,13 @@
 
 import 'package:_fe_analyzer_shared/src/type_inference/type_analyzer_operations.dart'
     show Variance;
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_visitor.dart';
 import 'package:analyzer/src/dart/element/extensions.dart';
 
 class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
-  final List<TypeParameterElement> _typeParameters;
+  final List<TypeParameterElement2> _typeParameters;
   Variance _variance;
 
   NonCovariantTypeParameterPositionVisitor(
@@ -30,15 +30,15 @@ class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
     var oldVariance = _variance;
 
     _variance = Variance.invariant;
-    for (var typeParameter in type.typeFormals) {
+    for (var typeParameter in type.typeParameters) {
       var bound = typeParameter.bound;
       if (bound != null && bound.accept(this)) {
         return true;
       }
     }
 
     _variance = oldVariance.combine(Variance.contravariant);
-    for (var formalParameter in type.parameters) {
+    for (var formalParameter in type.formalParameters) {
       if (formalParameter.type.accept(this)) {
         return true;
       }
@@ -77,7 +77,7 @@ class NonCovariantTypeParameterPositionVisitor implements TypeVisitor<bool> {
   @override
   bool visitTypeParameterType(TypeParameterType type) {
     return _variance != Variance.covariant &&
-        _typeParameters.contains(type.element);
+        _typeParameters.contains(type.element3);
   }
 
   @override

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -4806,7 +4806,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     var representationType = element.representation.type;
 
     for (var typeParameterNode in typeParameters) {
-      var typeParameterElement = typeParameterNode.declaredElement!;
+      var typeParameterElement = typeParameterNode.declaredFragment!.element;
       var nonCovariant = representationType.accept(
         NonCovariantTypeParameterPositionVisitor(
           [typeParameterElement],

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -464,7 +464,7 @@ mixin ElementsTypesMixin {
     return parameter;
   }
 
-  ParameterElement positionalParameter({
+  ParameterElementImpl positionalParameter({
     String? name,
     required DartType type,
     bool isCovariant = false,

pkg/analyzer/test/src/dart/element/non_covariant_type_parameter_position_test.dart

@@ -166,7 +166,7 @@ class NonCovariantTypeParameterPositionVisitorTest
   bool _compute(DartType type) {
     return type.accept(
       NonCovariantTypeParameterPositionVisitor(
-        [T_element],
+        [T_element.element],
         initialVariance: Variance.covariant,
       ),
     );

pkg/analyzer/test/src/services/top_level_declarations_test.dart

@@ -2,7 +2,7 @@
 // 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:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/services/top_level_declarations.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -19,24 +19,24 @@ main() {
 class TopLevelDeclarationsTest extends PubPackageResolutionTest {
   /// Verifies that the located public export for [element] is the library with
   /// URI [libraryUri].
-  Future<void> expectPublicExport(Element element, String libraryUri) async {
+  Future<void> expectPublicExport(Element2 element, String libraryUri) async {
     var publicLibrary =
-        await TopLevelDeclarations(result).publiclyExporting(element);
-    expect(publicLibrary?.source.uri.toString(), libraryUri);
+        await TopLevelDeclarations(result).publiclyExporting2(element);
+    expect(publicLibrary?.firstFragment.source.uri.toString(), libraryUri);
   }
 
   test_publiclyExporting_getter() async {
     await resolveFileCode('$testPackageLibPath/src/x.dart', "var x = 1;");
     newFile('$testPackageLibPath/x.dart', "export 'src/x.dart';");
 
-    var element = findElement.topGet('x');
+    var element = findElement2.topGet('x');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 
   test_publiclyExporting_lib() async {
     await resolveFileCode('$testPackageLibPath/x.dart', "class X {}");
 
-    var element = findElement.class_('X');
+    var element = findElement2.class_('X');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 
@@ -50,23 +50,23 @@ class TopLevelDeclarationsTest extends PubPackageResolutionTest {
     newFile('$testPackageLibPath/x2.dart', "export 'src/x.dart';");
     newFile('$testPackageLibPath/x3.dart', "class X {}");
 
-    var element = findElement.class_('X');
+    var element = findElement2.class_('X');
     await expectPublicExport(element, 'package:test/x2.dart');
   }
 
   test_publiclyExporting_setter() async {
     await resolveFileCode('$testPackageLibPath/src/x.dart', "var x = 1;");
     newFile('$testPackageLibPath/x.dart', "export 'src/x.dart';");
 
-    var element = findElement.topSet('x');
+    var element = findElement2.topSet('x');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 
   test_publiclyExporting_src() async {
     await resolveFileCode('$testPackageLibPath/src/x.dart', "class X {}");
     newFile('$testPackageLibPath/x.dart', "export 'src/x.dart';");
 
-    var element = findElement.class_('X');
+    var element = findElement2.class_('X');
     await expectPublicExport(element, 'package:test/x.dart');
   }
 }

pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart

@@ -1305,7 +1305,7 @@ library
 
     var libraryResult = await analysisSession.getLibraryByUri(uriStr);
     libraryResult as LibraryElementResult;
-    return libraryResult.element as LibraryElementImpl;
+    return libraryResult.element2 as LibraryElementImpl;
   }
 }
 

pkg/analyzer/test/src/summary/top_level_inference_test.dart

@@ -123,7 +123,7 @@ var b1 = a[1];
 var t = (int p) {};
 ''');
     assertType(
-      findElement.topVar('t').type,
+      findElement2.topVar('t').type,
       'Null Function(int)',
     );
   }
@@ -134,7 +134,7 @@ var a = 0;
 var t = (int p) => (a = 1);
 ''');
     assertType(
-      findElement.topVar('t').type,
+      findElement2.topVar('t').type,
       'int Function(int)',
     );
   }
@@ -144,7 +144,7 @@ var t = (int p) => (a = 1);
 var t = (int a, b,int c, d) => 0;
 ''');
     assertType(
-      findElement.topVar('t').type,
+      findElement2.topVar('t').type,
       'int Function(int, dynamic, int, dynamic)',
     );
   }
@@ -21240,6 +21240,6 @@ library
     var analysisSession = contextFor(testFile).currentSession;
     var result = await analysisSession.getUnitElement(testFile.path);
     result as UnitElementResult;
-    return result.element.library as LibraryElementImpl;
+    return result.fragment.element as LibraryElementImpl;
   }
 }

pkg/dartdev/lib/src/commands/build.dart

@@ -11,6 +11,7 @@ import 'package:dartdev/src/experiments.dart';
 import 'package:dartdev/src/native_assets_bundling.dart';
 import 'package:dartdev/src/sdk.dart';
 import 'package:dartdev/src/utils.dart';
+import 'package:file/local.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
 import 'package:native_assets_builder/native_assets_builder.dart';
@@ -134,9 +135,11 @@ class BuildCommand extends DartdevCommand {
     stdout.writeln('Building native assets.');
     final workingDirectory = Directory.current.uri;
     final target = Target.current;
-    final targetMacOSVersion =
-        target.os == OS.macOS ? minimumSupportedMacOSVersion : null;
+    final macOSConfig = target.os == OS.macOS
+        ? MacOSConfig(targetVersion: minimumSupportedMacOSVersion)
+        : null;
     final nativeAssetsBuildRunner = NativeAssetsBuildRunner(
+      fileSystem: const LocalFileSystem(),
       dartExecutable: Uri.file(sdk.dart),
       logger: logger(verbose),
     );
@@ -149,7 +152,7 @@ class BuildCommand extends DartdevCommand {
           targetOS: target.os,
           linkModePreference: LinkModePreference.dynamic,
           targetArchitecture: target.architecture,
-          targetMacOSVersion: targetMacOSVersion,
+          macOSConfig: macOSConfig,
           cCompilerConfig: cCompilerConfig,
         ),
       configValidator: (config) async => [
@@ -207,7 +210,7 @@ class BuildCommand extends DartdevCommand {
             targetOS: target.os,
             targetArchitecture: target.architecture,
             linkModePreference: LinkModePreference.dynamic,
-            targetMacOSVersion: targetMacOSVersion,
+            macOSConfig: macOSConfig,
             cCompilerConfig: cCompilerConfig,
           ),
         configValidator: (config) async => [
@@ -217,8 +220,6 @@ class BuildCommand extends DartdevCommand {
         resourceIdentifiers:
             recordUseEnabled ? Uri.file(recordedUsagesPath!) : null,
         workingDirectory: workingDirectory,
-
-
         buildResult: buildResult,
         buildAssetTypes: [
           CodeAsset.type,