diff --git a/DEPS b/DEPS index cc4777e093d4e..713653ecc735d 100644 --- a/DEPS +++ b/DEPS @@ -31,7 +31,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': 'cd9a42239f76e110dd73aeaac4c69a057a76ddf1', + 'dart_revision': 'ef720983530e04819b6fda0659ed7a3fdb190060', 'dart_args_tag': '1.4.4', 'dart_async_tag': '2.0.8', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index ba70e444fdc73..f5e87bbd1aeb3 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: fbcaf0eca04aa4bfacf6dcc71a919be3 +Signature: 7e3e1daeb388f5b96234b99e29bf6711 UNUSED LICENSES: diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index d257830ebd6ba..45fe883b324a9 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -86,6 +86,12 @@ action("generate_snapshot_bin") { "--await_is_keyword", "--vm_flag", "--enable_mirrors=false", + "--vm_flag", + "--no-strong", + "--vm_flag", + "--no-sync-async", + "--vm_flag", + "--no-reify-generic-functions", "--vm_output_bin", rebase_path(vm_snapshot_data, root_build_dir), "--vm_instructions_output_bin", @@ -289,6 +295,9 @@ template("generate_entry_points_json_with_gen_snapshot") { output, ] args = [ + "--no-strong", + "--no-sync-async", + "--no-reify-generic-functions", "--print-precompiler-entry-points=" + rebase_path(output), "--snapshot-kind=app-aot-blobs", "--vm_snapshot_data=" + rebase_path("$target_gen_dir/dummy.vm_data.snapshot"), diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index b263914538217..b0c9d355a2159 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -92,7 +92,15 @@ static const char* kDartCheckedModeArgs[] = { // clang-format on }; -static const char* kDartStrongModeArgs[] = { +static const char* kDartModeArgs[] = { + // clang-format off + "--no-strong", + "--no-reify_generic_functions", + "--no-sync_async", + // clang-format on +}; + +static const char* kDart2ModeArgs[] = { // clang-format off "--strong", "--reify_generic_functions", @@ -381,16 +389,19 @@ DartVM::DartVM(const Settings& settings, << isolate_snapshot_is_dart_2; if (is_preview_dart2) { - PushBackAll(&args, kDartStrongModeArgs, arraysize(kDartStrongModeArgs)); + PushBackAll(&args, kDart2ModeArgs, arraysize(kDart2ModeArgs)); if (use_checked_mode) { PushBackAll(&args, kDartAssertArgs, arraysize(kDartAssertArgs)); } - } else if (use_checked_mode) { - FML_DLOG(INFO) << "Checked mode is ON"; - PushBackAll(&args, kDartAssertArgs, arraysize(kDartAssertArgs)); - PushBackAll(&args, kDartCheckedModeArgs, arraysize(kDartCheckedModeArgs)); } else { - FML_DLOG(INFO) << "Is not Dart 2 and Checked mode is OFF"; + PushBackAll(&args, kDartModeArgs, arraysize(kDartModeArgs)); + if (use_checked_mode) { + FML_DLOG(INFO) << "Checked mode is ON"; + PushBackAll(&args, kDartAssertArgs, arraysize(kDartAssertArgs)); + PushBackAll(&args, kDartCheckedModeArgs, arraysize(kDartCheckedModeArgs)); + } else { + FML_DLOG(INFO) << "Is not Dart 2 and Checked mode is OFF"; + } } if (settings.start_paused) {