Roll Dart SDK to 8b036b3e63cbfb6866975f98548051f4dc156ab6. (#6)

Also includes:

Call dart::bin::Platform::Initialize during Dart VM startup
(flutter/flutter#182689)

Author: knopp

DEPS

@@ -46,29 +46,27 @@ vars = {
   # updated revision list of existing dependencies. You will need to
   # gclient sync before and after update deps to ensure all deps are updated.
   # updated revision list of existing dependencies.
-  'dart_revision': 'b4a40b86a4f9f3f0ba82941d28839245fab0273e',
+  'dart_revision': '8b036b3e63cbfb6866975f98548051f4dc156ab6',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
-  'dart_ai_rev': '25a627892f5f398dabf78b91d20ac151f7be2b05',
-  'dart_binaryen_rev': 'cf2ab2c8b36ded5e3ba5fff03e41c25c20c582f2',
-  'dart_boringssl_rev': '94e35034946ba05eee2a5f9ca88c18628a615d8d',
-  'dart_core_rev': 'cbb485437c61d37753bcc98818beca54d5b38f69',
-  'dart_devtools_rev': 'b9d7fc1a4119b3d214a77939f9d75b0c0b25d36a',
-  'dart_ecosystem_rev': 'eac66d93142907b39f2271647c111f36ff3365b9',
-  'dart_http_rev': 'a22386e9c390290c916d1c53a3d3c1447ec120ce',
-  'dart_i18n_rev': 'dd8a792a8492370a594706c8304d2eb8db844d7a',
-  'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
+  'dart_ai_rev': 'fd7ce1e5b27a85a73af175d85d72f670bc453bac',
+  'dart_binaryen_rev': '204c3f88bb2e2c92b103b0cfbf4e0a4863c12c87',
+  'dart_boringssl_rev': '9a74210911fd45b13274f4b9784c4c6a9c6de0f0',
+  'dart_core_rev': '5782e0c7d79146e75b170829edb38afd4d69edc5',
+  'dart_devtools_rev': '0a0cf24dcd589e9436e266d09b6ababa09b8c70e',
+  'dart_ecosystem_rev': '7bfb1cb1a34794f21b68f80ba1dcc0f3ce701a63',
+  'dart_http_rev': '30013eb7bc9d7023c39efc18738cd46e00f47dc6',
+  'dart_i18n_rev': 'de7e11b7cc231d8daf6e49dc12690d7339241691',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
-  'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': '9e30258e0aa6a6430ee36c84b75308a9702fde42',
-  'dart_pub_rev': 'ed2628f65de5d54922e2d34ebbcb1bafa8c93cc2',
+  'dart_protobuf_rev': 'd5639f45b8468fba684b076b9403ccd5f2290056',
+  'dart_pub_rev': '26c6985c742593d081f8b58450f463a584a4203a',
   'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
-  'dart_tools_rev': '93bf967097d251a4d43d4ae65ea047fe3e7f7fa7',
-  'dart_vector_math_rev': '70a9a2cb610d040b247f3ca2cd70a94c1c6f6f23',
-  'dart_web_rev': '35fc98dd8f9da175ed0a2dcf246299e922e1e1e2',
+  'dart_tools_rev': 'fe7cd20a6cf7d9e91b174d1ba5941ef70bcd4cc4',
+  'dart_vector_math_rev': '66d590b3cbb73397ed1b8aa87b55b2251c536008',
+  'dart_web_rev': '94d22feda246280b39661f3b74c0ea48a25dd3e7',
   'dart_webdev_rev': '234e44c2ba0aa6cee5a36026538ca89457bf0d55',
-  'dart_webdriver_rev': '09104f459ed834d48b132f6b7734923b1fbcf2e9',
+  'dart_webdriver_rev': '9b6e829cfe4e6ca0cff7910e2ec58ed809dbc303',
   'dart_webkit_inspection_protocol_rev': '0f7685804d77ec02c6564d7ac1a6c8a2341c5bdf',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
@@ -242,14 +240,6 @@ deps = {
   'engine/src/flutter/third_party/boringssl/src':
   'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
-  'engine/src/flutter/third_party/protobuf':
-   Var('flutter_git') + '/third_party/protobuf' + '@' + Var('dart_libprotobuf_rev'),
-
-  # TODO(67373): These are temporarily checked in, but this dep can be restored
-  # once the buildmoot is completed.
-  # 'engine/src/flutter/build/secondary/third_party/protobuf':
-  #  Var('flutter_git') + '/third_party/protobuf-gn' + '@' + Var('dart_protobuf_gn_rev'),
-
   'engine/src/flutter/third_party/dart':
    Var('dart_git') + '/sdk.git' + '@' + Var('dart_revision'),
 
@@ -259,10 +249,10 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:b9d7fc1a4119b3d214a77939f9d75b0c0b25d36a'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:0a0cf24dcd589e9436e266d09b6ababa09b8c70e'}]},
 
   'engine/src/flutter/third_party/dart/third_party/perfetto/src':
-   Var('android_git') + '/platform/external/perfetto' + '@' + Var('dart_perfetto_rev'),
+   Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/ai':
    Var('dart_git') + '/ai.git' + '@' + Var('dart_ai_rev'),
@@ -271,7 +261,7 @@ deps = {
    Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@f624489a5013ec58de469d4fd8793c283f62b5d8',
+   Var('dart_git') + '/dart_style.git@a6b10dcc3db33597d058cdd602c6059137550b9b',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@af0085039035557c792b2d08965e24c2dd342d63',
@@ -289,7 +279,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@4c78a125651d3499b616b2b0624ea35f3315d20c',
+   Var('dart_git') + '/native.git@8c3f3ecd2e8f06b0922951e3d433f8754cb4dd4c',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -298,7 +288,7 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@dd830a0338b31bee92fe7ebc20b9bb963403b6b0',
+   Var('dart_git') + '/shelf.git@6e60bbeb17b2c07613fe1d6dd02ced2d05b82cc2',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
    Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -307,7 +297,7 @@ deps = {
    Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@f95c0f5c10fa9af35014117cb00ec17d2a117265',
+   Var('dart_git') + '/test.git@5adf49a2d20c9844e393152c2984b81ecfa3b6cb',
 
   'engine/src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),

engine/src/build_overrides/build.gni

@@ -14,3 +14,5 @@ perfetto_build_with_embedder = true
 
 perfetto_root_path = "//flutter/third_party/dart/third_party/perfetto/src/"
 
+perfetto_protobuf_target_prefix = "//flutter/third_party/dart/third_party/perfetto/mock_protobuf"
+perfetto_protobuf_gni = perfetto_protobuf_target_prefix + "/proto_library.gni"

engine/src/flutter/runtime/dart_vm.cc

@@ -20,6 +20,7 @@
 #include "flutter/runtime/dart_isolate.h"
 #include "flutter/runtime/dart_vm_initializer.h"
 #include "flutter/runtime/ptrace_check.h"
+#include "third_party/dart/runtime/bin/platform.h"
 #include "third_party/dart/runtime/include/bin/dart_io_api.h"
 #include "third_party/tonic/converter/dart_converter.h"
 #include "third_party/tonic/dart_class_library.h"
@@ -285,6 +286,10 @@ DartVM::DartVM(const std::shared_ptr<const DartVMData>& vm_data,
   FML_DCHECK(isolate_name_server_);
   FML_DCHECK(service_protocol_);
 
+  if (!dart::bin::Platform::Initialize(false)) {
+    FML_LOG(FATAL) << "Dart platform-specific initialization failed";
+  }
+
   {
     TRACE_EVENT0("flutter", "dart::bin::BootstrapDartIo");
     dart::bin::BootstrapDartIo();

engine/src/flutter/testing/dart/BUILD.gn

@@ -16,6 +16,7 @@ tests = [
   "lerp_test.dart",
   "locale_test.dart",
   "plugin_utilities_test.dart",
+  "process_test.dart",
   "serial_gc_test.dart",
   "spawn_helper.dart",
   "spawn_test.dart",

engine/src/flutter/testing/dart/process_test.dart

@@ -0,0 +1,15 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:io';
+
+import 'package:test/test.dart';
+
+void main() {
+  test('start process with missing executable', () async {
+    final Future<Process> proc = Process.start('nonexistent-executable', []);
+    expect(proc, throwsA(isA<ProcessException>()));
+  });
+}

engine/src/flutter/tools/api_check/lib/apicheck.dart

@@ -12,35 +12,37 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/analysis/utilities.dart';
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element.dart';
 
 /// Returns all indexed fields in [className].
 ///
 /// Field names are expected to be of the form `kFooBarIndex`; prefixed with a
 /// `k` and terminated in `Index`.
-List<String> getDartClassFields({required String sourcePath, required String className}) {
+Future<List<String>> getDartClassFields({
+  required String sourcePath,
+  required String className,
+}) async {
   final includedPaths = <String>[sourcePath];
   final collection = AnalysisContextCollection(includedPaths: includedPaths);
   final AnalysisContext context = collection.contextFor(sourcePath);
   final AnalysisSession session = context.currentSession;
 
-  final SomeParsedUnitResult result = session.getParsedUnit(sourcePath);
-  if (result is! ParsedUnitResult) {
+  final SomeUnitElementResult result = await session.getUnitElement(sourcePath);
+  if (result is! UnitElementResult) {
     return <String>[];
   }
 
   // Locate all fields matching the expression in the class.
   final fieldExp = RegExp(r'_k(\w*)Index');
   final fields = <String>[];
-  for (final CompilationUnitMember unitMember in result.unit.declarations) {
-    if (unitMember is ClassDeclaration && unitMember.name.lexeme == className) {
-      for (final ClassMember classMember in unitMember.members) {
-        if (classMember is FieldDeclaration) {
-          for (final VariableDeclaration field in classMember.fields.variables) {
-            final String fieldName = field.name.lexeme;
-            final RegExpMatch? match = fieldExp.firstMatch(fieldName);
-            if (match != null) {
-              fields.add(match.group(1)!);
-            }
+  for (final ClassFragment cls in result.fragment.classes) {
+    if (cls.name == className) {
+      for (final FieldFragment field in cls.fields) {
+        final String? fieldName = field.name;
+        if (fieldName != null) {
+          final RegExpMatch? match = fieldExp.firstMatch(fieldName);
+          if (match != null) {
+            fields.add(match.group(1)!);
           }
         }
       }

engine/src/flutter/tools/api_check/test/apicheck_test.dart

@@ -31,9 +31,9 @@ void main() {
 /// never done. See the note at the top of `shell/platform/embedder/embedder.h`
 /// for further details.
 void checkApiConsistency(String flutterRoot) {
-  test('AccessibilityFeatures enums match', () {
+  test('AccessibilityFeatures enums match', () async {
     // Dart values: _kFooBarIndex = 1 << N
-    final List<String> uiFields = getDartClassFields(
+    final List<String> uiFields = await getDartClassFields(
       sourcePath: path.join(flutterRoot, 'lib', 'ui', 'window.dart'),
       className: 'AccessibilityFeatures',
     );
@@ -67,13 +67,13 @@ void checkApiConsistency(String flutterRoot) {
     expect(javaEnumValues, uiFields);
   });
 
-  test('SemanticsAction enums match', () {
+  test('SemanticsAction enums match', () async {
     // Dart values: _kFooBarIndex = 1 << N.
-    final List<String> uiFields = getDartClassFields(
+    final List<String> uiFields = await getDartClassFields(
       sourcePath: path.join(flutterRoot, 'lib', 'ui', 'semantics.dart'),
       className: 'SemanticsAction',
     );
-    final List<String> webuiFields = getDartClassFields(
+    final List<String> webuiFields = await getDartClassFields(
       sourcePath: path.join(flutterRoot, 'lib', 'web_ui', 'lib', 'semantics.dart'),
       className: 'SemanticsAction',
     );
@@ -108,13 +108,13 @@ void checkApiConsistency(String flutterRoot) {
     expect(javaEnumValues, uiFields);
   });
 
-  test('AppLifecycleState enums match', () {
+  test('AppLifecycleState enums match', () async {
     // Dart values: _kFooBarIndex = 1 << N.
-    final List<String> uiFields = getDartClassFields(
+    final List<String> uiFields = await getDartClassFields(
       sourcePath: path.join(flutterRoot, 'lib', 'ui', 'platform_dispatcher.dart'),
       className: 'AppLifecycleState',
     );
-    final List<String> webuiFields = getDartClassFields(
+    final List<String> webuiFields = await getDartClassFields(
       sourcePath: path.join(flutterRoot, 'lib', 'web_ui', 'lib', 'platform_dispatcher.dart'),
       className: 'AppLifecycleState',
     );

engine/src/flutter/web_sdk/test/api_conform_test.dart

@@ -364,10 +364,10 @@ void _collectPublicClasses(
         continue;
       }
       final ClassDeclaration classDeclaration = member;
-      if (classDeclaration.name.lexeme.startsWith('_')) {
+      if (classDeclaration.namePart.typeName.lexeme.startsWith('_')) {
         continue;
       }
-      destination[classDeclaration.name.lexeme] = classDeclaration;
+      destination[classDeclaration.namePart.typeName.lexeme] = classDeclaration;
     }
   }
 }
@@ -376,7 +376,12 @@ void _collectPublicConstructors(
   ClassDeclaration classDeclaration,
   Map<String, ConstructorDeclaration> destination,
 ) {
-  for (final ClassMember member in classDeclaration.members) {
+  final ClassBody classBody = classDeclaration.body;
+  if (classBody is! BlockClassBody) {
+    return;
+  }
+
+  for (final ClassMember member in classBody.members) {
     if (member is! ConstructorDeclaration) {
       continue;
     }
@@ -396,7 +401,12 @@ void _collectPublicMethods(
   ClassDeclaration classDeclaration,
   Map<String, MethodDeclaration> destination,
 ) {
-  for (final ClassMember member in classDeclaration.members) {
+  final ClassBody classBody = classDeclaration.body;
+  if (classBody is! BlockClassBody) {
+    return;
+  }
+
+  for (final ClassMember member in classBody.members) {
     if (member is! MethodDeclaration) {
       continue;
     }