Skip to content

Commit

Permalink
Roll src/third_party/dart 67ab3be10d...b5aeaa6796 (flutter#9675)
Browse files Browse the repository at this point in the history
* Roll src/third_party/dart 67ab3be10d...b5aeaa6796

dart-lang/sdk@b5aeaa6796 Revert "Reland "[vm/ffi] SimDBC on Arm64 Android""
dart-lang/sdk@02fe07bbd3 [dart2js] new-rti: Set Array instance type
dart-lang/sdk@bae5bdefd5 [dart2js] Add '--golem-x' command-line flag
dart-lang/sdk@ac30ab12ab [dartdevc] Bump pedantic to v1.8.0 and apply new lints
dart-lang/sdk@4b0c5c166a fix field name
dart-lang/sdk@327f5eb826 Fix for issue 37429
dart-lang/sdk@43891316ca [ VM / Observatory ] Emit IsolateReload event after reload completes
dart-lang/sdk@2ea7e5513b Perform type promotion when NNBD, using flow analysis.
dart-lang/sdk@766e542e53 handle return in async function
dart-lang/sdk@51cf8f218a Add entension support to the summary idl
dart-lang/sdk@0e9957c7b1 [dartdevc] Adding support for analyzer dep pruning
dart-lang/sdk@c100308ba6 Repro for inferring arrays with out of range lengths
dart-lang/sdk@5d77657e7a Prepare to publish analyzer version 0.37.0.
dart-lang/sdk@86ce74caaa update NodeBuilder for default value type arguments
dart-lang/sdk@439692c9e2 Mark the name in an extension as being in a declaration context
dart-lang/sdk@372bcae536 [gardening] Fix 3xHEAD Flutter build after revert
dart-lang/sdk@052874e93e Avoid non-web integer literal in corelib_2/int_round_test
dart-lang/sdk@480337106e Implementation of extension override AST node
dart-lang/sdk@4f78ad90df An initial and partial implementation of an element model for extensions
dart-lang/sdk@744bb47361 [infra] Remove custom timeouts for dart2js compiler config
dart-lang/sdk@9b53686ffb update NodeBuilder for declared identifier implicit type
dart-lang/sdk@3d14b75f97 Revert "Reland "[vm/concurrency] Introduce concept of Isolate Groups""
dart-lang/sdk@527238e008 [vm] Cleanup C99 header includes
dart-lang/sdk@9f32f9b87e [cfe] Store the initializer tokens in constructor builders
dart-lang/sdk@bbbeb8b509 Pull in latest pub
dart-lang/sdk@851958ee54 update NodeBuilder to handle for loop
dart-lang/sdk@7a73682c6a update NodeBuilder to handle catch clause
dart-lang/sdk@fc6cb0ac21 [vm/ffi] Revamp struct representation in FFI.
dart-lang/sdk@5fd51b9fd2 Cleanup remnants of ignoring Dart v1.x subtype checks
dart-lang/sdk@45172f0690 Revert "Reland "[llvm] Add initial scaffolding""
dart-lang/sdk@b9a6630367 [ Observatory ] _getVMTimeline -> getVMTimeline in timeline.js
dart-lang/sdk@1f02c10b9a Update language_2/const_map4_test for type inference
dart-lang/sdk@99ed4871b3 Fix a hint in analysis server
dart-lang/sdk@c3c43689d5 [vm] Remove platform/math.h
dart-lang/sdk@524fdc13a9 Reland "[llvm] Add initial scaffolding"
dart-lang/sdk@45a9815aff [vm/debugger] break on asyncfunction entry
dart-lang/sdk@e0eeffaf9b update NodeBuilder parameter tracking when visiting executable declarations
dart-lang/sdk@182a59cebb Skip all tests that use spawnUri when running in simulator mode as it makes no sense to run the CFE on the simulator.
dart-lang/sdk@1427a218f3 update DecoratedType asserts
dart-lang/sdk@f4dc001729 Migration: begin adding support for LUB computations in conditional expressions.
dart-lang/sdk@585794ab75 Fix status file line.
dart-lang/sdk@4a69ef4a50 Skip all spawnURI tests for the simulator architectures as these tests involve invoking the front end for compilation which would mean the front end has to run in simulated mode.
dart-lang/sdk@26f369eb8e Fix doc comment for NullabilityNode.forLUB
dart-lang/sdk@9ed728ec7a Add: Example usage to fillRange method.
dart-lang/sdk@fc7049ae7d Migration: implement support for user-definable prefix expressions.
dart-lang/sdk@77aa5f0c02 Migration: Add support for function-typed formal parameters.
dart-lang/sdk@326e970b81 Migration: handle method invocations that resolve to a getter.
dart-lang/sdk@822de210b5 fix branch_canonicalization_test
dart-lang/sdk@a2e1434603 Breaking changes for analyzer version 0.37
dart-lang/sdk@6694aa821d [dart2js] new-rti: Temporary work-around for timeouts
dart-lang/sdk@18ff5ce893 [dart2js] new-rti: Implement general As/Check methods
dart-lang/sdk@90c88d984e Fix large integer literals in dart2js_extra/round_constant_folding_test
dart-lang/sdk@9349f71721 bump linter to 0.1.93
dart-lang/sdk@c384212f9e [vm] Remove vestigial verified_memory_test.cc file
dart-lang/sdk@f4824d332d [vm] Drop support for MSVC older than 2013
dart-lang/sdk@bbb027aa2a [vm] Fix offset that was breaking bare_instructions_trampolines_test
dart-lang/sdk@1db0b4436c [dart2js] new-rti: Implement type bounds check
dart-lang/sdk@686742585a Migration: add a more robust assertion to the DecoratedType constructor
dart-lang/sdk@2fd4ca570b set DecoratedType.returnType for FunctionType
dart-lang/sdk@ca4b6e533a [dart2js] new-rti: Implement basic is-test
dart-lang/sdk@39b71253ce Fix for curly_braces_in_flow_control_structures lint.
dart-lang/sdk@b6c3b2c98c Enable 'Surround with XYZ' only for Statement(s) in Block(s).
dart-lang/sdk@79e478e50e Fixed some links
dart-lang/sdk@279c1da42d Use absolute paths as canonical paths for inputs digest maps
dart-lang/sdk@cbf9cff19f Infer types of field formals before all fields.
dart-lang/sdk@0c6b3d1277 Migration: do better function type formatting in DecoratedType.toString.
dart-lang/sdk@a76c459239 Migration: Remove unnecessary duplicate type test
dart-lang/sdk@a515a0c256 Reland "[vm/ffi] SimDBC on Arm64 Android"
dart-lang/sdk@0baf81e7d6 Tests for Never and potential nullable / non-nullable.
dart-lang/sdk@26d308aad3 Use flow analysis for reporting use sites of not assigned locals during resolution.
dart-lang/sdk@79f276e07d Migration: handle field formal parameters.
dart-lang/sdk@c8c3572ca9 Migration: standardize method names in EdgeBuilderTest.
dart-lang/sdk@c0c15c1283 Migration: build nullability node for default type parameter bounds directly.
dart-lang/sdk@b57ff85906 Migration: clean up and test implicit dynamic return type of Function() syntax.
dart-lang/sdk@0f2eda8644 Migration: add support for function expression invocations.
dart-lang/sdk@a200980da0 Migration: add support for variable and field type inference.
dart-lang/sdk@ca25f56883 Migration: add support for type inference of function types.
dart-lang/sdk@a436c0621f Migration: fix DecoratedType.toString to support named function parameters.
dart-lang/sdk@9dee307bdb Migration: update nullability graph debug dump to support union edges.
dart-lang/sdk@b60dcdbf73 Migration: Remove the `create` parameter from Variables.decoratedElementType.
dart-lang/sdk@18c21ee9d1 Migration: add support for generic instance creation.
dart-lang/sdk@f7ddfdf6ca Migration: don't forget to visit variable initializers in NodeBuilder.
dart-lang/sdk@a39e4fabfb Add information about the deprecated ParameterElement.parameterKind
dart-lang/sdk@f6dfad02f4 [analyzer] add a space to the quick for for REPLACE_COLON_WITH_EQUALS

* Update license.
  • Loading branch information
a-siva committed Jul 4, 2019
1 parent 3c4dbe2 commit 11b6afe
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 55 deletions.
8 changes: 4 additions & 4 deletions DEPS
Expand Up @@ -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': 'b5aeaa67960c03e528b76c5cfa55059a058de34e',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down Expand Up @@ -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',
Expand All @@ -75,10 +75,10 @@ vars = {
'dart_package_config_tag': '1.0.5',
'dart_package_resolver_tag': '1.0.10',
'dart_path_tag': '1.6.2',
'dart_pedantic_tag': 'v1.7.0',
'dart_pedantic_tag': 'v1.8.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',
Expand Down
9 changes: 3 additions & 6 deletions ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
Signature: f1e40299965f80773c3d4983274e6c46
Signature: eba9f5f513005a7e6179d4faf3731252

UNUSED LICENSES:

Expand Down Expand Up @@ -5824,14 +5824,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.
Expand Down Expand Up @@ -5874,8 +5875,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
Expand Down Expand Up @@ -6530,7 +6529,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
Expand Down Expand Up @@ -6600,7 +6598,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
Expand Down
22 changes: 10 additions & 12 deletions runtime/dart_isolate.cc
Expand Up @@ -163,7 +163,7 @@ bool DartIsolate::Initialize(Dart_Isolate dart_isolate, bool is_root_isolate) {
}

auto* isolate_data = static_cast<std::shared_ptr<DartIsolate>*>(
Dart_IsolateGroupData(dart_isolate));
Dart_IsolateData(dart_isolate));
if (isolate_data->get() != this) {
return false;
}
Expand All @@ -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());
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -777,10 +775,10 @@ void DartIsolate::DartIsolateShutdownCallback(
isolate_group_data->get()->OnShutdownCallback();
}

// |Dart_IsolateGroupCleanupCallback|
void DartIsolate::DartIsolateGroupCleanupCallback(
std::shared_ptr<DartIsolate>* isolate_group_data) {
delete isolate_group_data;
// |Dart_IsolateCleanupCallback|
void DartIsolate::DartIsolateCleanupCallback(
std::shared_ptr<DartIsolate>* isolate_data) {
delete isolate_data;
}

fml::RefPtr<const DartSnapshot> DartIsolate::GetIsolateSnapshot() const {
Expand Down
10 changes: 5 additions & 5 deletions runtime/dart_isolate.h
Expand Up @@ -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,
Expand Down Expand Up @@ -189,9 +189,9 @@ class DartIsolate : public UIDartState {
std::shared_ptr<DartIsolate>* isolate_group_data,
std::shared_ptr<DartIsolate>* isolate_data);

// |Dart_IsolateGroupCleanupCallback|
static void DartIsolateGroupCleanupCallback(
std::shared_ptr<DartIsolate>* isolate_group_data);
// |Dart_IsolateCleanupCallback|
static void DartIsolateCleanupCallback(
std::shared_ptr<DartIsolate>* embedder_isolate);

FML_DISALLOW_COPY_AND_ASSIGN(DartIsolate);
};
Expand Down
13 changes: 6 additions & 7 deletions runtime/dart_vm.cc
Expand Up @@ -366,13 +366,12 @@ DartVM::DartVM(std::shared_ptr<const DartVMData> vm_data,
params.vm_snapshot_data = vm_data_->GetVMSnapshot().GetDataMapping();
params.vm_snapshot_instructions =
vm_data_->GetVMSnapshot().GetInstructionsMapping();
params.create_group = reinterpret_cast<decltype(params.create_group)>(
DartIsolate::DartIsolateGroupCreateCallback);
params.shutdown_isolate =
reinterpret_cast<decltype(params.shutdown_isolate)>(
DartIsolate::DartIsolateShutdownCallback);
params.cleanup_group = reinterpret_cast<decltype(params.cleanup_group)>(
DartIsolate::DartIsolateGroupCleanupCallback);
params.create = reinterpret_cast<decltype(params.create)>(
DartIsolate::DartIsolateCreateCallback);
params.shutdown = reinterpret_cast<decltype(params.shutdown)>(
DartIsolate::DartIsolateShutdownCallback);
params.cleanup = reinterpret_cast<decltype(params.cleanup)>(
DartIsolate::DartIsolateCleanupCallback);
params.thread_exit = ThreadExitCallback;
params.get_service_assets = GetVMServiceAssetsArchiveCallback;
params.entropy_source = dart::bin::GetEntropy;
Expand Down
7 changes: 3 additions & 4 deletions shell/platform/fuchsia/dart/dart_component_controller.cc
Expand Up @@ -324,13 +324,12 @@ bool DartComponentController::CreateIsolate(
auto state = new std::shared_ptr<tonic::DartState>(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;
}

Expand Down
26 changes: 13 additions & 13 deletions shell/platform/fuchsia/dart/dart_runner.cc
Expand Up @@ -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");
Expand All @@ -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();
Expand All @@ -92,8 +92,8 @@ void IsolateShutdownCallback(void* isolate_group_data, void* isolate_data) {
}
}

void IsolateGroupCleanupCallback(void* isolate_group_data) {
delete static_cast<std::shared_ptr<tonic::DartState>*>(isolate_group_data);
void IsolateCleanupCallback(void* callback_data) {
delete static_cast<std::shared_ptr<tonic::DartState>*>(callback_data);
}

void RunApplication(
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/fuchsia/dart/service_isolate.cc
Expand Up @@ -123,14 +123,14 @@ Dart_Isolate CreateServiceIsolate(const char* uri,
#endif

auto state = new std::shared_ptr<tonic::DartState>(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;
}

Expand Down

0 comments on commit 11b6afe

Please sign in to comment.