Skip to content

Commit 3c4dbe2

Browse files
authored
Revert " Roll src/third_party/dart 67ab3be10d...43891316ca (flutter#9670)" (flutter#9673)
This reverts commit 5e596f2.
1 parent 5e596f2 commit 3c4dbe2

8 files changed

Lines changed: 52 additions & 46 deletions

File tree

‎DEPS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ vars = {
3434
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3535
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3636
# updated revision list of existing dependencies.
37-
'dart_revision': '43891316caeffc57f1b33bad4257ee25c2417d2e',
37+
'dart_revision': '67ab3be10d35d994641da167cc806f20a7ffa679',
3838

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -63,7 +63,7 @@ vars = {
6363
'dart_http_throttle_tag': '1.0.2',
6464
'dart_intl_tag': '0.15.7',
6565
'dart_json_rpc_2_tag': '2.0.9',
66-
'dart_linter_tag': '0.1.93',
66+
'dart_linter_tag': '0.1.92',
6767
'dart_logging_tag': '0.11.3+2',
6868
'dart_markdown_tag': '2.0.3',
6969
'dart_matcher_tag': '0.12.3',
@@ -78,7 +78,7 @@ vars = {
7878
'dart_pedantic_tag': 'v1.7.0',
7979
'dart_pool_tag': '1.3.6',
8080
'dart_protobuf_rev': '7d34c9e4e552a4f66acce32e4344ae27756a1949',
81-
'dart_pub_rev': 'df0f72daaa724e29ed6075e0fb5549a6d6dc5daf',
81+
'dart_pub_rev': 'ecd5b413271f2699f8cd9e23aa4eebb5030c964f',
8282
'dart_pub_semver_tag': '1.4.2',
8383
'dart_quiver-dart_tag': '2.0.0+1',
8484
'dart_resource_rev': 'f8e37558a1c4f54550aa463b88a6a831e3e33cd6',

‎ci/licenses_golden/licenses_third_party‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: d2373d09889ca9af4d6e79393ce5b0cb
1+
Signature: f1e40299965f80773c3d4983274e6c46
22

33
UNUSED LICENSES:
44

@@ -4614,7 +4614,6 @@ FILE: ../../../third_party/dart/runtime/observatory/web/favicon.ico
46144614
FILE: ../../../third_party/dart/runtime/observatory/web/index.html
46154615
FILE: ../../../third_party/dart/runtime/observatory/web/third_party/trace_viewer_full.html
46164616
FILE: ../../../third_party/dart/runtime/observatory/web/timeline.html
4617-
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi_dbc_trampoline_arm64.S
46184617
FILE: ../../../third_party/dart/runtime/vm/compiler/ffi_dbc_trampoline_x64_linux_mac.S
46194618
FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-default.svg
46204619
FILE: ../../../third_party/dart/samples/ffi/sqlite/docs/lib/scenario-full.svg
@@ -5825,15 +5824,14 @@ FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/bindings/types.dart
58255824
FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/collections/closable_iterator.dart
58265825
FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/database.dart
58275826
FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/arena.dart
5827+
FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/cstring.dart
58285828
FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/dylib_utils.dart
5829-
FILE: ../../../third_party/dart/samples/ffi/sqlite/lib/src/ffi/utf8.dart
58305829
FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/rti.dart
58315830
FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/shared/recipe_syntax.dart
58325831
FILE: ../../../third_party/dart/sdk/lib/ffi/annotations.dart
58335832
FILE: ../../../third_party/dart/sdk/lib/ffi/dynamic_library.dart
58345833
FILE: ../../../third_party/dart/sdk/lib/ffi/ffi.dart
58355834
FILE: ../../../third_party/dart/sdk/lib/ffi/native_type.dart
5836-
FILE: ../../../third_party/dart/sdk/lib/ffi/struct.dart
58375835
----------------------------------------------------------------------------------------------------
58385836
Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
58395837
for details. All rights reserved.
@@ -5876,6 +5874,8 @@ FILE: ../../../third_party/dart/runtime/lib/math.cc
58765874
FILE: ../../../third_party/dart/runtime/lib/mirrors.h
58775875
FILE: ../../../third_party/dart/runtime/lib/object.cc
58785876
FILE: ../../../third_party/dart/runtime/lib/string.cc
5877+
FILE: ../../../third_party/dart/runtime/platform/c99_support_win.h
5878+
FILE: ../../../third_party/dart/runtime/platform/inttypes_support_win.h
58795879
FILE: ../../../third_party/dart/runtime/vm/bitfield.h
58805880
FILE: ../../../third_party/dart/runtime/vm/code_patcher_ia32_test.cc
58815881
FILE: ../../../third_party/dart/runtime/vm/code_patcher_x64_test.cc
@@ -6530,6 +6530,7 @@ FILE: ../../../third_party/dart/runtime/observatory/lib/src/service/object.dart
65306530
FILE: ../../../third_party/dart/runtime/observatory/lib/utils.dart
65316531
FILE: ../../../third_party/dart/runtime/observatory/web/main.dart
65326532
FILE: ../../../third_party/dart/runtime/platform/address_sanitizer.h
6533+
FILE: ../../../third_party/dart/runtime/platform/math.h
65336534
FILE: ../../../third_party/dart/runtime/platform/memory_sanitizer.h
65346535
FILE: ../../../third_party/dart/runtime/platform/safe_stack.h
65356536
FILE: ../../../third_party/dart/runtime/tools/verbose_gc_to_bmu.dart
@@ -6599,6 +6600,7 @@ FILE: ../../../third_party/dart/runtime/vm/tags.cc
65996600
FILE: ../../../third_party/dart/runtime/vm/unibrow-inl.h
66006601
FILE: ../../../third_party/dart/runtime/vm/unibrow.cc
66016602
FILE: ../../../third_party/dart/runtime/vm/unibrow.h
6603+
FILE: ../../../third_party/dart/runtime/vm/verified_memory_test.cc
66026604
FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/d8.js
66036605
FILE: ../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/preambles/jsshell.js
66046606
FILE: ../../../third_party/dart/sdk/lib/_internal/js_runtime/lib/linked_hash_map.dart

‎runtime/dart_isolate.cc‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) {
163163
}
164164

165165
auto* isolate_data = static_cast<std::shared_ptr<DartIsolate>*>(
166-
Dart_IsolateData(dart_isolate));
166+
Dart_IsolateGroupData(dart_isolate));
167167
if (isolate_data->get() != this) {
168168
return false;
169169
}
@@ -174,7 +174,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) {
174174
// We are entering a new scope (for the first time since initialization) and
175175
// we want to restore the current scope to null when we exit out of this
176176
// method. This balances the implicit Dart_EnterIsolate call made by
177-
// Dart_CreateIsolate (which calls the Initialize).
177+
// Dart_CreateIsolateGroup (which calls the Initialize).
178178
Dart_ExitIsolate();
179179

180180
tonic::DartIsolateScope scope(isolate());
@@ -636,8 +636,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
636636
return service_isolate->isolate();
637637
}
638638

639-
// |Dart_IsolateCreateCallback|
640-
Dart_Isolate DartIsolate::DartIsolateCreateCallback(
639+
// |Dart_IsolateGroupCreateCallback|
640+
Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback(
641641
const char* advisory_script_uri,
642642
const char* advisory_script_entrypoint,
643643
const char* package_root,
@@ -720,14 +720,16 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
720720
}
721721

722722
// Create the Dart VM isolate and give it the embedder object as the baton.
723-
Dart_Isolate isolate = Dart_CreateIsolate(
723+
Dart_Isolate isolate = Dart_CreateIsolateGroup(
724724
advisory_script_uri, //
725725
advisory_script_entrypoint, //
726726
(*embedder_isolate)->GetIsolateSnapshot()->GetDataMapping(),
727727
(*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(),
728728
(*embedder_isolate)->GetSharedSnapshot()->GetDataMapping(),
729729
(*embedder_isolate)->GetSharedSnapshot()->GetInstructionsMapping(), flags,
730-
embedder_isolate.get(), error);
730+
embedder_isolate.get(), // isolate_group_data
731+
embedder_isolate.get(), // isolate_data
732+
error);
731733

732734
if (isolate == nullptr) {
733735
FML_DLOG(ERROR) << *error;
@@ -775,8 +777,8 @@ void DartIsolate::DartIsolateShutdownCallback(
775777
isolate_group_data->get()->OnShutdownCallback();
776778
}
777779

778-
// |Dart_IsolateCleanupCallback|
779-
void DartIsolate::DartIsolateCleanupCallback(
780+
// |Dart_IsolateGroupCleanupCallback|
781+
void DartIsolate::DartIsolateGroupCleanupCallback(
780782
std::shared_ptr<DartIsolate>* isolate_group_data) {
781783
delete isolate_group_data;
782784
}

‎runtime/dart_isolate.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ class DartIsolate : public UIDartState {
156156

157157
void OnShutdownCallback();
158158

159-
// |Dart_IsolateCreateCallback|
160-
static Dart_Isolate DartIsolateCreateCallback(
159+
// |Dart_IsolateGroupCreateCallback|
160+
static Dart_Isolate DartIsolateGroupCreateCallback(
161161
const char* advisory_script_uri,
162162
const char* advisory_script_entrypoint,
163163
const char* package_root,
@@ -189,9 +189,9 @@ class DartIsolate : public UIDartState {
189189
std::shared_ptr<DartIsolate>* isolate_group_data,
190190
std::shared_ptr<DartIsolate>* isolate_data);
191191

192-
// |Dart_IsolateCleanupCallback|
193-
static void DartIsolateCleanupCallback(
194-
std::shared_ptr<DartIsolate>* embedder_isolate);
192+
// |Dart_IsolateGroupCleanupCallback|
193+
static void DartIsolateGroupCleanupCallback(
194+
std::shared_ptr<DartIsolate>* isolate_group_data);
195195

196196
FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate);
197197
};

‎runtime/dart_vm.cc‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,13 @@ DartVM::DartVM(std::shared_ptr<const DartVMData> vm_data,
366366
params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping();
367367
params.vm_snapshot_instructions =
368368
vm_data_->GetVMSnapshot().GetInstructionsMapping();
369-
params.create = reinterpret_cast<decltype(params.create)>(
370-
DartIsolate::DartIsolateCreateCallback);
371-
params.shutdown = reinterpret_cast<decltype(params.shutdown)>(
372-
DartIsolate::DartIsolateShutdownCallback);
373-
params.cleanup = reinterpret_cast<decltype(params.cleanup)>(
374-
DartIsolate::DartIsolateCleanupCallback);
369+
params.create_group = reinterpret_cast<decltype(params.create_group)>(
370+
DartIsolate::DartIsolateGroupCreateCallback);
371+
params.shutdown_isolate =
372+
reinterpret_cast<decltype(params.shutdown_isolate)>(
373+
DartIsolate::DartIsolateShutdownCallback);
374+
params.cleanup_group = reinterpret_cast<decltype(params.cleanup_group)>(
375+
DartIsolate::DartIsolateGroupCleanupCallback);
375376
params.thread_exit = ThreadExitCallback;
376377
params.get_service_assets = GetVMServiceAssetsArchiveCallback;
377378
params.entropy_source = dart::bin::GetEntropy;

‎shell/platform/fuchsia/dart/dart_component_controller.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,13 @@ bool DartComponentController::CreateIsolate(
324324
auto state = new std::shared_ptr<tonic::DartState>(new tonic::DartState(
325325
namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); }));
326326

327-
isolate_ = Dart_CreateIsolate(
327+
isolate_ = Dart_CreateIsolateGroup(
328328
url_.c_str(), label_.c_str(), isolate_snapshot_data,
329329
isolate_snapshot_instructions, shared_snapshot_data,
330-
shared_snapshot_instructions, nullptr /* flags */, state, &error);
330+
shared_snapshot_instructions, nullptr /* flags */,
331+
state /* isolate_group_data */, state /* isolate_data */, &error);
331332
if (!isolate_) {
332-
FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", error);
333+
FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", error);
333334
return false;
334335
}
335336

‎shell/platform/fuchsia/dart/dart_runner.cc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ const char* kDartVMArgs[] = {
6161
// clang-format on
6262
};
6363

64-
Dart_Isolate IsolateCreateCallback(const char* uri,
65-
const char* name,
66-
const char* package_root,
67-
const char* package_config,
68-
Dart_IsolateFlags* flags,
69-
void* callback_data,
70-
char** error) {
64+
Dart_Isolate IsolateGroupCreateCallback(const char* uri,
65+
const char* name,
66+
const char* package_root,
67+
const char* package_config,
68+
Dart_IsolateFlags* flags,
69+
void* callback_data,
70+
char** error) {
7171
if (std::string(uri) == DART_VM_SERVICE_ISOLATE_NAME) {
7272
#if defined(DART_PRODUCT)
7373
*error = strdup("The service isolate is not implemented in product mode");
@@ -81,7 +81,7 @@ Dart_Isolate IsolateCreateCallback(const char* uri,
8181
return NULL;
8282
}
8383

84-
void IsolateShutdownCallback(void* callback_data) {
84+
void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) {
8585
// The service isolate (and maybe later the kernel isolate) doesn't have an
8686
// async loop.
8787
auto dispatcher = async_get_default_dispatcher();
@@ -92,8 +92,8 @@ void IsolateShutdownCallback(void* callback_data) {
9292
}
9393
}
9494

95-
void IsolateCleanupCallback(void* callback_data) {
96-
delete static_cast<std::shared_ptr<tonic::DartState>*>(callback_data);
95+
void IsolateGroupCleanupCallback(void* isolate_group_data) {
96+
delete static_cast<std::shared_ptr<tonic::DartState>*>(isolate_group_data);
9797
}
9898

9999
void RunApplication(
@@ -167,9 +167,9 @@ DartRunner::DartRunner() : context_(sys::ComponentContext::Create()) {
167167
params.vm_snapshot_data = vm_snapshot_data_.address();
168168
params.vm_snapshot_instructions = vm_snapshot_instructions_.address();
169169
#endif
170-
params.create = IsolateCreateCallback;
171-
params.shutdown = IsolateShutdownCallback;
172-
params.cleanup = IsolateCleanupCallback;
170+
params.create_group = IsolateGroupCreateCallback;
171+
params.shutdown_isolate = IsolateShutdownCallback;
172+
params.cleanup_group = IsolateGroupCleanupCallback;
173173
params.entropy_source = EntropySource;
174174
#if !defined(DART_PRODUCT)
175175
params.get_service_assets = GetVMServiceAssetsArchiveCallback;

‎shell/platform/fuchsia/dart/service_isolate.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ Dart_Isolate CreateServiceIsolate(const char* uri,
123123
#endif
124124

125125
auto state = new std::shared_ptr<tonic::DartState>(new tonic::DartState());
126-
Dart_Isolate isolate = Dart_CreateIsolate(
126+
Dart_Isolate isolate = Dart_CreateIsolateGroup(
127127
uri, DART_VM_SERVICE_ISOLATE_NAME, mapped_isolate_snapshot_data.address(),
128128
mapped_isolate_snapshot_instructions.address(),
129129
mapped_shared_snapshot_data.address(),
130-
mapped_shared_snapshot_instructions.address(), nullptr /* flags */, state,
131-
error);
130+
mapped_shared_snapshot_instructions.address(), nullptr /* flags */,
131+
state /* isolate_group_data */, state /* isolate_data */, error);
132132
if (!isolate) {
133-
FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolate failed: %s", *error);
133+
FX_LOGF(ERROR, LOG_TAG, "Dart_CreateIsolateGroup failed: %s", *error);
134134
return nullptr;
135135
}
136136

0 commit comments

Comments
 (0)