diff --git a/DEPS b/DEPS index 4c23a67f7c0b59c426c0bd2d25784a71b04cde8d..1bac642ea5e0a7880f0419022c0c86805acbb0c5 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,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': '67ab3be10d35d994641da167cc806f20a7ffa679', + 'dart_revision': '43891316caeffc57f1b33bad4257ee25c2417d2e', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -63,7 +63,7 @@ vars = { 'dart_http_throttle_tag': '1.0.2', 'dart_intl_tag': '0.15.7', 'dart_json_rpc_2_tag': '2.0.9', - 'dart_linter_tag': '0.1.92', + 'dart_linter_tag': '0.1.93', 'dart_logging_tag': '0.11.3+2', 'dart_markdown_tag': '2.0.3', 'dart_matcher_tag': '0.12.3', @@ -78,7 +78,7 @@ vars = { 'dart_pedantic_tag': 'v1.7.0', 'dart_pool_tag': '1.3.6', 'dart_protobuf_rev': '7d34c9e4e552a4f66acce32e4344ae27756a1949', - 'dart_pub_rev': 'ecd5b413271f2699f8cd9e23aa4eebb5030c964f', + 'dart_pub_rev': 'df0f72daaa724e29ed6075e0fb5549a6d6dc5daf', 'dart_pub_semver_tag': '1.4.2', 'dart_quiver-dart_tag': '2.0.0+1', 'dart_resource_rev': 'f8e37558a1c4f54550aa463b88a6a831e3e33cd6', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index d4ba48565cfaa83080b5f38c5115485b1d526ac8..84b751bf3d4e1652d5a0f4d225dd7fc82a9e5d9c 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: f1e40299965f80773c3d4983274e6c46 +Signature: d2373d09889ca9af4d6e79393ce5b0cb UNUSED LICENSES: @@ -4614,6 +4614,7 @@ FILE: ../../../third_party/dart/runtime/observatory/web/favicon.ico FILE: ../../../third_party/dart/runtime/observatory/web/index.html FILE: ../../../third_party/dart/runtime/observatory/web/third_party/trace_viewer_full.html FILE: ../../../third_party/dart/runtime/observatory/web/timeline.html +FILE: ../../../third_party/dart/runtime/vm/compiler/ffi_dbc_trampoline_arm64.S FILE: ../../../third_party/dart/runtime/vm/compiler/ffi_dbc_trampoline_x64_linux_mac.S FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-default.svg FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-full.svg @@ -5824,14 +5825,15 @@ FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/bindings/types.dart FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/collections/closable_iterator.dart FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/database.dart FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/arena.dart -FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/cstring.dart FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/dylib_utils.dart +FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/utf8.dart FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/rti.dart FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/shared/recipe_syntax.dart FILE: ../../../third_party/dart/sdk/lib/ffi/annotations.dart FILE: ../../../third_party/dart/sdk/lib/ffi/dynamic_library.dart FILE: ../../../third_party/dart/sdk/lib/ffi/ffi.dart FILE: ../../../third_party/dart/sdk/lib/ffi/native_type.dart +FILE: ../../../third_party/dart/sdk/lib/ffi/struct.dart ---------------------------------------------------------------------------------------------------- Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file for details. All rights reserved. @@ -5874,8 +5876,6 @@ FILE: ../../../third_party/dart/runtime/lib/math.cc FILE: ../../../third_party/dart/runtime/lib/mirrors.h FILE: ../../../third_party/dart/runtime/lib/object.cc FILE: ../../../third_party/dart/runtime/lib/string.cc -FILE: ../../../third_party/dart/runtime/platform/c99_support_win.h -FILE: ../../../third_party/dart/runtime/platform/inttypes_support_win.h FILE: ../../../third_party/dart/runtime/vm/bitfield.h FILE: ../../../third_party/dart/runtime/vm/code_patcher_ia32_test.cc FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64_test.cc @@ -6530,7 +6530,6 @@ FILE: ../../../third_party/dart/runtime/observatory/lib/src/service/object.dart FILE: ../../../third_party/dart/runtime/observatory/lib/utils.dart FILE: ../../../third_party/dart/runtime/observatory/web/main.dart FILE: ../../../third_party/dart/runtime/platform/address_sanitizer.h -FILE: ../../../third_party/dart/runtime/platform/math.h FILE: ../../../third_party/dart/runtime/platform/memory_sanitizer.h FILE: ../../../third_party/dart/runtime/platform/safe_stack.h FILE: ../../../third_party/dart/runtime/tools/verbose_gc_to_bmu.dart @@ -6600,7 +6599,6 @@ FILE: ../../../third_party/dart/runtime/vm/tags.cc FILE: ../../../third_party/dart/runtime/vm/unibrow-inl.h FILE: ../../../third_party/dart/runtime/vm/unibrow.cc FILE: ../../../third_party/dart/runtime/vm/unibrow.h -FILE: ../../../third_party/dart/runtime/vm/verified_memory_test.cc FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc index b649ca8343820d6ea3a6360cc225acc1292e2fce..da2d9ec252e6174f7a8882dff7482402e6100765 100644 --- a/runtime/dart_isolate.cc +++ b/runtime/dart_isolate.cc @@ -163,7 +163,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) { } auto* isolate_data = static_cast*>( - Dart_IsolateGroupData(dart_isolate)); + Dart_IsolateData(dart_isolate)); if (isolate_data->get() != this) { return false; } @@ -174,7 +174,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) { // We are entering a new scope (for the first time since initialization) and // we want to restore the current scope to null when we exit out of this // method. This balances the implicit Dart_EnterIsolate call made by - // Dart_CreateIsolateGroup (which calls the Initialize). + // Dart_CreateIsolate (which calls the Initialize). Dart_ExitIsolate(); tonic::DartIsolateScope scope(isolate()); @@ -636,8 +636,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate( return service_isolate->isolate(); } -// |Dart_IsolateGroupCreateCallback| -Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback( +// |Dart_IsolateCreateCallback| +Dart_Isolate DartIsolate::DartIsolateCreateCallback( const char* advisory_script_uri, const char* advisory_script_entrypoint, const char* package_root, @@ -720,16 +720,14 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair( } // Create the Dart VM isolate and give it the embedder object as the baton. - Dart_Isolate isolate = Dart_CreateIsolateGroup( + Dart_Isolate isolate = Dart_CreateIsolate( advisory_script_uri, // advisory_script_entrypoint, // (*embedder_isolate)->GetIsolateSnapshot()->GetDataMapping(), (*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(), (*embedder_isolate)->GetSharedSnapshot()->GetDataMapping(), (*embedder_isolate)->GetSharedSnapshot()->GetInstructionsMapping(), flags, - embedder_isolate.get(), // isolate_group_data - embedder_isolate.get(), // isolate_data - error); + embedder_isolate.get(), error); if (isolate == nullptr) { FML_DLOG(ERROR) << *error; @@ -777,8 +775,8 @@ void DartIsolate::DartIsolateShutdownCallback( isolate_group_data->get()->OnShutdownCallback(); } -// |Dart_IsolateGroupCleanupCallback| -void DartIsolate::DartIsolateGroupCleanupCallback( +// |Dart_IsolateCleanupCallback| +void DartIsolate::DartIsolateCleanupCallback( std::shared_ptr* isolate_group_data) { delete isolate_group_data; } diff --git a/runtime/dart_isolate.h b/runtime/dart_isolate.h index 453810b1bdab3b289baa434f8d2f6a2daf596352..60412972abc9387d778035b98e328ec4e83cb17d 100644 --- a/runtime/dart_isolate.h +++ b/runtime/dart_isolate.h @@ -156,8 +156,8 @@ class DartIsolate : public UIDartState { void OnShutdownCallback(); - // |Dart_IsolateGroupCreateCallback| - static Dart_Isolate DartIsolateGroupCreateCallback( + // |Dart_IsolateCreateCallback| + static Dart_Isolate DartIsolateCreateCallback( const char* advisory_script_uri, const char* advisory_script_entrypoint, const char* package_root, @@ -189,9 +189,9 @@ class DartIsolate : public UIDartState { std::shared_ptr* isolate_group_data, std::shared_ptr* isolate_data); - // |Dart_IsolateGroupCleanupCallback| - static void DartIsolateGroupCleanupCallback( - std::shared_ptr* isolate_group_data); + // |Dart_IsolateCleanupCallback| + static void DartIsolateCleanupCallback( + std::shared_ptr* embedder_isolate); FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate); }; diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 555d0c9ee17e265b46ea14028e515f7527f23c9f..903e74b1591f71b5333aa25b290ac593f4cff168 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -366,13 +366,12 @@ DartVM::DartVM(std::shared_ptr vm_data, params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping(); params.vm_snapshot_instructions = vm_data_->GetVMSnapshot().GetInstructionsMapping(); - params.create_group = reinterpret_cast( - DartIsolate::DartIsolateGroupCreateCallback); - params.shutdown_isolate = - reinterpret_cast( - DartIsolate::DartIsolateShutdownCallback); - params.cleanup_group = reinterpret_cast( - DartIsolate::DartIsolateGroupCleanupCallback); + params.create = reinterpret_cast( + DartIsolate::DartIsolateCreateCallback); + params.shutdown = reinterpret_cast( + DartIsolate::DartIsolateShutdownCallback); + params.cleanup = reinterpret_cast( + DartIsolate::DartIsolateCleanupCallback); params.thread_exit = ThreadExitCallback; params.get_service_assets = GetVMServiceAssetsArchiveCallback; params.entropy_source = dart::bin::GetEntropy; diff --git a/shell/platform/fuchsia/dart/dart_component_controller.cc b/shell/platform/fuchsia/dart/dart_component_controller.cc index c8e7cc5ab79502c4e319b7000215df54fc14e7fb..1c4f71050594d4f727f76f1afb09beaadb2cdd35 100644 --- a/shell/platform/fuchsia/dart/dart_component_controller.cc +++ b/shell/platform/fuchsia/dart/dart_component_controller.cc @@ -324,13 +324,12 @@ bool DartComponentController::CreateIsolate( auto state = new std::shared_ptr(new tonic::DartState( namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); })); - isolate_ = Dart_CreateIsolateGroup( + isolate_ = Dart_CreateIsolate( url_.c_str(), label_.c_str(), isolate_snapshot_data, isolate_snapshot_instructions, shared_snapshot_data, - shared_snapshot_instructions, nullptr /* flags */, - state /* isolate_group_data */, state /* isolate_data */, &error); + shared_snapshot_instructions, nullptr /* flags */, state, &error); if (!isolate_) { - FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error); + FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", error); return false; } diff --git a/shell/platform/fuchsia/dart/dart_runner.cc b/shell/platform/fuchsia/dart/dart_runner.cc index b9ded3ac468eccf7f4623ff8b6f7182a549ec51f..200500d2c90f6191c467f04e51b85790fb9a29ec 100644 --- a/shell/platform/fuchsia/dart/dart_runner.cc +++ b/shell/platform/fuchsia/dart/dart_runner.cc @@ -61,13 +61,13 @@ const char* kDartVMArgs[] = { // clang-format on }; -Dart_Isolate IsolateGroupCreateCallback(const char* uri, - const char* name, - const char* package_root, - const char* package_config, - Dart_IsolateFlags* flags, - void* callback_data, - char** error) { +Dart_Isolate IsolateCreateCallback(const char* uri, + const char* name, + const char* package_root, + const char* package_config, + Dart_IsolateFlags* flags, + void* callback_data, + char** error) { if (std::string(uri) == DART_VM_SERVICE_ISOLATE_NAME) { #if defined(DART_PRODUCT) *error = strdup("The service isolate is not implemented in product mode"); @@ -81,7 +81,7 @@ Dart_Isolate IsolateGroupCreateCallback(const char* uri, return NULL; } -void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) { +void IsolateShutdownCallback(void* callback_data) { // The service isolate (and maybe later the kernel isolate) doesn't have an // async loop. auto dispatcher = async_get_default_dispatcher(); @@ -92,8 +92,8 @@ void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) { } } -void IsolateGroupCleanupCallback(void* isolate_group_data) { - delete static_cast*>(isolate_group_data); +void IsolateCleanupCallback(void* callback_data) { + delete static_cast*>(callback_data); } void RunApplication( @@ -167,9 +167,9 @@ DartRunner::DartRunner() : context_(sys::ComponentContext::Create()) { params.vm_snapshot_data = vm_snapshot_data_.address(); params.vm_snapshot_instructions = vm_snapshot_instructions_.address(); #endif - params.create_group = IsolateGroupCreateCallback; - params.shutdown_isolate = IsolateShutdownCallback; - params.cleanup_group = IsolateGroupCleanupCallback; + params.create = IsolateCreateCallback; + params.shutdown = IsolateShutdownCallback; + params.cleanup = IsolateCleanupCallback; params.entropy_source = EntropySource; #if !defined(DART_PRODUCT) params.get_service_assets = GetVMServiceAssetsArchiveCallback; diff --git a/shell/platform/fuchsia/dart/service_isolate.cc b/shell/platform/fuchsia/dart/service_isolate.cc index 5287d638f29abee988eb8f72c1dcdc5fffd63e46..2e6eda2659de489b1a3ae97e2c758d68511fc33e 100644 --- a/shell/platform/fuchsia/dart/service_isolate.cc +++ b/shell/platform/fuchsia/dart/service_isolate.cc @@ -123,14 +123,14 @@ Dart_Isolate CreateServiceIsolate(const char* uri, #endif auto state = new std::shared_ptr(new tonic::DartState()); - Dart_Isolate isolate = Dart_CreateIsolateGroup( + Dart_Isolate isolate = Dart_CreateIsolate( uri, DART_VM_SERVICE_ISOLATE_NAME, mapped_isolate_snapshot_data.address(), mapped_isolate_snapshot_instructions.address(), mapped_shared_snapshot_data.address(), - mapped_shared_snapshot_instructions.address(), nullptr /* flags */, - state /* isolate_group_data */, state /* isolate_data */, error); + mapped_shared_snapshot_instructions.address(), nullptr /* flags */, state, + error); if (!isolate) { - FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", *error); + FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", *error); return nullptr; }