Skip to content

Commit b3bb39b

Browse files
authored
Roll src/third_party/dart 06c3d7ad3a...09fc76bc51 (#9728)
* Roll src/third_party/dart 06c3d7ad3a...09fc76bc51 dart-lang/sdk@09fc76bc51 [vm, compiler] Remove dead _classRangeCheckNegative. dart-lang/sdk@b472d7a9be Unnecessary null aware spread hint dart-lang/sdk@f939ad3964 library scope extensions dart-lang/sdk@9503969664 [vm/bytecode] Add DebugCheck bytecode instruction dart-lang/sdk@fc542be6b4 Issue 36682. Check that selection offset/length is valid in Extract Method refactoring. dart-lang/sdk@803658a6d8 [corelib_2] fix bigint_from_test for web platforms dart-lang/sdk@ad6b1ebbd6 Support for 'double' fields in protocol. dart-lang/sdk@5479175012 Remove incorrect test. dart-lang/sdk@058092b5f6 [vm] Fix simarm_x64 build on mac dart-lang/sdk@307ca3f3b6 [vm/bytecode] Improve single stepping and breakpoint setting in bytecode. dart-lang/sdk@855830f324 Update LSP spec dart-lang/sdk@d992f55094 [dartfix] Bump pedantic dep to v1.8.0 and cleanup lint violations dart-lang/sdk@41330f3e34 gitignore .clangd dart-lang/sdk@8d07009931 [ VM / Gardening ] Mark disassemble_determinism_test as slow on Windows dart-lang/sdk@1b82367ed6 Update CHANGELOG to reflect breaking change #36765 dart-lang/sdk@a86db84e0a [fasta] Preserve information about const constructors in outline. dart-lang/sdk@25319ef7a6 Fix bug in codegen/string_escapes_test.dart. dart-lang/sdk@7acecda2cc [vm/ffi] Fix FFI Utf8 example. dart-lang/sdk@e3b3c6fa28 [vm] Rename 3head flutter patch after re-land of concurrency change dart-lang/sdk@2cb5303782 [infra] Update checked in SDKs to 2.4.0 dart-lang/sdk@fce43ebc4e [ddk] Pass environmentDefines to CFE through CompilerOptions dart-lang/sdk@5450d08ca1 Add support for analyzer static error tests. dart-lang/sdk@0425997b31 Second attempt to reland "[vm/concurrency] Introduce concept of Isolate Groups" dart-lang/sdk@5470159054 [vm, gc] Produce a proper error message when crashing due to lack of memory at isolate startup. dart-lang/sdk@bfc7d21da6 Remove useless dart2js_extra/class_test dart-lang/sdk@572619b639 [vm, bytecode] Fix vm/cc/CompileFunctionOnHelperThread. dart-lang/sdk@4de495fccc [vm, compiler] Remove dead stub ICCallThroughFunction. dart-lang/sdk@8a1dcdae68 Graduate 'flutter' domain from experimental, remove unused methods and fields. dart-lang/sdk@a945888627 Discard constructors and fields temporarily to get valid code compiling * Fix analyzer warning.
1 parent 2284210 commit b3bb39b

File tree

9 files changed

+48
-44
lines changed

9 files changed

+48
-44
lines changed

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': '06c3d7ad3a33b7c4d42067c1a24c9279c321071f',
37+
'dart_revision': '09fc76bc51274e91b76d8a9030a236a678311392',
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
@@ -364,7 +364,7 @@ deps = {
364364
Var('dart_git') + '/package_resolver.git' + '@' + Var('dart_package_resolver_tag'),
365365

366366
'src/third_party/dart/tools/sdks':
367-
{'packages': [{'version': 'version:2.3.3-dev.0.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
367+
{'packages': [{'version': 'version:2.4.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
368368

369369
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
370370

@@ -467,7 +467,7 @@ deps = {
467467
'packages': [
468468
{
469469
'package': 'dart/dart-sdk/${{platform}}',
470-
'version': 'version:2.3.0'
470+
'version': 'version:2.4.0'
471471
}
472472
],
473473
'dep_type': 'cipd',

ci/licenses_golden/licenses_third_party

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f5fe7081d04877d56a90cf48e34de6c6
1+
Signature: 867dd399b0f19bf93a3ed95b59498779
22

33
UNUSED LICENSES:
44

lib/ui/hooks.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void _runMainZoned(Function startMainIsolateFunction,
205205
Function userMainFunction,
206206
List<String> args) {
207207
startMainIsolateFunction((){
208-
runZoned<Future<void>>(() {
208+
runZoned<void>(() {
209209
if (userMainFunction is _BinaryFunction) {
210210
// This seems to be undocumented but supported by the command line VM.
211211
// Let's do the same in case old entry-points are ported to Flutter.

runtime/dart_isolate.cc

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

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

184184
tonic::DartIsolateScope scope(isolate());
@@ -641,8 +641,8 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
641641
return service_isolate->isolate();
642642
}
643643

644-
// |Dart_IsolateCreateCallback|
645-
Dart_Isolate DartIsolate::DartIsolateCreateCallback(
644+
// |Dart_IsolateGroupCreateCallback|
645+
Dart_Isolate DartIsolate::DartIsolateGroupCreateCallback(
646646
const char* advisory_script_uri,
647647
const char* advisory_script_entrypoint,
648648
const char* package_root,
@@ -726,14 +726,16 @@ DartIsolate::CreateDartVMAndEmbedderObjectPair(
726726
}
727727

728728
// Create the Dart VM isolate and give it the embedder object as the baton.
729-
Dart_Isolate isolate = Dart_CreateIsolate(
729+
Dart_Isolate isolate = Dart_CreateIsolateGroup(
730730
advisory_script_uri, //
731731
advisory_script_entrypoint, //
732732
(*embedder_isolate)->GetIsolateSnapshot()->GetDataMapping(),
733733
(*embedder_isolate)->GetIsolateSnapshot()->GetInstructionsMapping(),
734734
(*embedder_isolate)->GetSharedSnapshot()->GetDataMapping(),
735735
(*embedder_isolate)->GetSharedSnapshot()->GetInstructionsMapping(), flags,
736-
embedder_isolate.get(), error);
736+
embedder_isolate.get(), // isolate_group_data
737+
embedder_isolate.get(), // isolate_group
738+
error);
737739

738740
if (isolate == nullptr) {
739741
FML_DLOG(ERROR) << *error;
@@ -781,8 +783,8 @@ void DartIsolate::DartIsolateShutdownCallback(
781783
isolate_group_data->get()->OnShutdownCallback();
782784
}
783785

784-
// |Dart_IsolateCleanupCallback|
785-
void DartIsolate::DartIsolateCleanupCallback(
786+
// |Dart_IsolateGroupCleanupCallback|
787+
void DartIsolate::DartIsolateGroupCleanupCallback(
786788
std::shared_ptr<DartIsolate>* isolate_data) {
787789
delete isolate_data;
788790
}

runtime/dart_isolate.h

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

159159
void OnShutdownCallback();
160160

161-
// |Dart_IsolateCreateCallback|
162-
static Dart_Isolate DartIsolateCreateCallback(
161+
// |Dart_IsolateGroupCreateCallback|
162+
static Dart_Isolate DartIsolateGroupCreateCallback(
163163
const char* advisory_script_uri,
164164
const char* advisory_script_entrypoint,
165165
const char* package_root,
@@ -191,9 +191,9 @@ class DartIsolate : public UIDartState {
191191
std::shared_ptr<DartIsolate>* isolate_group_data,
192192
std::shared_ptr<DartIsolate>* isolate_data);
193193

194-
// |Dart_IsolateCleanupCallback|
195-
static void DartIsolateCleanupCallback(
196-
std::shared_ptr<DartIsolate>* embedder_isolate);
194+
// |Dart_IsolateGroupCleanupCallback|
195+
static void DartIsolateGroupCleanupCallback(
196+
std::shared_ptr<DartIsolate>* isolate_group_data);
197197

198198
FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate);
199199
};

runtime/dart_vm.cc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,13 @@ DartVM::DartVM(std::shared_ptr<const DartVMData> vm_data,
367367
params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping();
368368
params.vm_snapshot_instructions =
369369
vm_data_->GetVMSnapshot().GetInstructionsMapping();
370-
params.create = reinterpret_cast<decltype(params.create)>(
371-
DartIsolate::DartIsolateCreateCallback);
372-
params.shutdown = reinterpret_cast<decltype(params.shutdown)>(
373-
DartIsolate::DartIsolateShutdownCallback);
374-
params.cleanup = reinterpret_cast<decltype(params.cleanup)>(
375-
DartIsolate::DartIsolateCleanupCallback);
370+
params.create_group = reinterpret_cast<decltype(params.create_group)>(
371+
DartIsolate::DartIsolateGroupCreateCallback);
372+
params.shutdown_isolate =
373+
reinterpret_cast<decltype(params.shutdown_isolate)>(
374+
DartIsolate::DartIsolateShutdownCallback);
375+
params.cleanup_group = reinterpret_cast<decltype(params.cleanup_group)>(
376+
DartIsolate::DartIsolateGroupCleanupCallback);
376377
params.thread_exit = ThreadExitCallback;
377378
params.get_service_assets = GetVMServiceAssetsArchiveCallback;
378379
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 IsolateCleanupCallback(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)