From 299baa6f1559961d6449bc1e995d98924789145a Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Thu, 29 Aug 2019 12:31:59 +0200 Subject: [PATCH 1/2] Roll src/third_party/dart 35382f9b14..05c28c6115 dart-lang/sdk@05c28c6115 Reland "Scaffolding for dart:wasm" dart-lang/sdk@d57a8f7451 [vm/bytecode] Remove DebugCheck in synthetic non-local transfer (no source pos). dart-lang/sdk@b565c8c20f Don't serialize not serializable constant variable initializers. dart-lang/sdk@ce12a2722d Migration: handle named parameters in _substituteFunctionAfterFormals. dart-lang/sdk@a290271dea [vm/bytecode] Throw should be 'debug checked', but not ReThrow. dart-lang/sdk@63133a2a8c [cfe] Handle extension instance method tearoff dart-lang/sdk@a147d4e8d2 [cfe] Handle simple use of extension instance members dart-lang/sdk@e9fdeb2db8 Migration: add support for creating instances without supplying type arguments. dart-lang/sdk@66e349da9c Migration: Clean up substitution logic in getOrComputeElementType dart-lang/sdk@e9a44ba6a8 fix extension instance field error dart-lang/sdk@15a7b57d8e split endFields into endClass/Mixin/ExtensionFields events dart-lang/sdk@ed1b4ffba1 Add tests of extensions of mixins dart-lang/sdk@ef36f1ba0d [vm/fuzzer] Reduce limit on methods and classes dart-lang/sdk@7b17602c74 [vm/bytecode] Include function name into source fingerprints dart-lang/sdk@851701d2a4 add BREAK suggestions to switch cases dart-lang/sdk@57f7941eef [cfe] Remove 'functionNestingLevel' for VariableDeclaration.forValue --- DEPS | 2 +- lib/snapshot/libraries.json | 22 ++++++++++------ lib/snapshot/libraries.yaml | 5 ++++ .../fuchsia/dart_runner/kernel/libraries.json | 26 ++++++++++++------- .../fuchsia/dart_runner/kernel/libraries.yaml | 5 ++++ .../fuchsia/flutter/kernel/libraries.json | 26 ++++++++++++------- .../fuchsia/flutter/kernel/libraries.yaml | 5 ++++ sky/packages/sky_engine/lib/_embedder.yaml | 1 + 8 files changed, 63 insertions(+), 29 deletions(-) diff --git a/DEPS b/DEPS index f7dcfb368e98f..6a2437bed6007 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': '35382f9b144b545c632b00d797139c9a96485edb', + 'dart_revision': '05c28c6115bbc438f6bbc14078eaf895679b6493', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/lib/snapshot/libraries.json b/lib/snapshot/libraries.json index 99ef4cd778f8c..b6ffcef58b4c9 100644 --- a/lib/snapshot/libraries.json +++ b/lib/snapshot/libraries.json @@ -72,6 +72,14 @@ "nativewrappers": { "uri": "../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" }, + "mirrors": { + "patches": [ + "../../../third_party/dart/runtime/lib/mirrors_patch.dart", + "../../../third_party/dart/runtime/lib/mirrors_impl.dart", + "../../../third_party/dart/runtime/lib/mirror_reference.dart" + ], + "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" + }, "developer": { "patches": [ "../../../third_party/dart/runtime/lib/developer.dart", @@ -87,17 +95,15 @@ ], "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart" }, - "mirrors": { - "patches": [ - "../../../third_party/dart/runtime/lib/mirrors_patch.dart", - "../../../third_party/dart/runtime/lib/mirrors_impl.dart", - "../../../third_party/dart/runtime/lib/mirror_reference.dart" - ], - "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, "_vmservice": { "uri": "../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" }, + "wasm": { + "patches": [ + "../../../third_party/dart/runtime/lib/wasm_patch.dart" + ], + "uri": "../../../third_party/dart/sdk/lib/wasm/wasm.dart" + }, "io": { "patches": [ "../../../third_party/dart/runtime/bin/common_patch.dart", diff --git a/lib/snapshot/libraries.yaml b/lib/snapshot/libraries.yaml index 57121cb789330..392e0500bfe2d 100644 --- a/lib/snapshot/libraries.yaml +++ b/lib/snapshot/libraries.yaml @@ -91,6 +91,11 @@ flutter: - "../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" - "../../../third_party/dart/runtime/lib/ffi_patch.dart" + wasm: + uri: "../../../third_party/dart/sdk/lib/wasm/wasm.dart" + patches: + - "../../../third_party/dart/runtime/lib/wasm_patch.dart" + _http: uri: "../../../third_party/dart/sdk/lib/_http/http.dart" diff --git a/shell/platform/fuchsia/dart_runner/kernel/libraries.json b/shell/platform/fuchsia/dart_runner/kernel/libraries.json index 1793b8303aa25..0abe212e6a3b4 100644 --- a/shell/platform/fuchsia/dart_runner/kernel/libraries.json +++ b/shell/platform/fuchsia/dart_runner/kernel/libraries.json @@ -1,6 +1,6 @@ { "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", - "comment:1": "Instead modify 'topaz/runtime/dart_runner/kernel/libraries.yaml' and follow the instructions therein.", + "comment:1": "Instead modify 'shell/platform/fuchsia/dart_runner/kernel/libraries.yaml' and follow the instructions therein.", "dart_runner": { "libraries": { "_builtin": { @@ -75,6 +75,14 @@ "nativewrappers": { "uri": "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" }, + "mirrors": { + "patches": [ + "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", + "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", + "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" + ], + "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" + }, "developer": { "patches": [ "../../../../../../third_party/dart/runtime/lib/developer.dart", @@ -90,17 +98,15 @@ ], "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" }, - "mirrors": { - "patches": [ - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, "_vmservice": { "uri": "../../../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" }, + "wasm": { + "patches": [ + "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" + ], + "uri": "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" + }, "io": { "patches": [ "../../../../../../third_party/dart/runtime/bin/common_patch.dart", @@ -155,4 +161,4 @@ } } } -} +} \ No newline at end of file diff --git a/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml b/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml index 25a818c31b826..cab901e60fd13 100644 --- a/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml +++ b/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml @@ -91,6 +91,11 @@ dart_runner: - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" + wasm: + uri: "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" + patches: + - "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" + _http: uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" diff --git a/shell/platform/fuchsia/flutter/kernel/libraries.json b/shell/platform/fuchsia/flutter/kernel/libraries.json index 7b64e16f45c29..5a4602d8c67fc 100644 --- a/shell/platform/fuchsia/flutter/kernel/libraries.json +++ b/shell/platform/fuchsia/flutter/kernel/libraries.json @@ -1,6 +1,6 @@ { "comment:0": "NOTE: THIS FILE IS GENERATED. DO NOT EDIT.", - "comment:1": "Instead modify 'kernel/libraries.yaml' and follow the instructions therein.", + "comment:1": "Instead modify 'shell/platform/fuchsia/flutter/kernel/libraries.yaml' and follow the instructions therein.", "flutter_runner": { "libraries": { "_builtin": { @@ -75,6 +75,14 @@ "nativewrappers": { "uri": "../../../../../../third_party/dart/sdk/lib/html/dartium/nativewrappers.dart" }, + "mirrors": { + "patches": [ + "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", + "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", + "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" + ], + "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" + }, "developer": { "patches": [ "../../../../../../third_party/dart/runtime/lib/developer.dart", @@ -90,17 +98,15 @@ ], "uri": "../../../../../../third_party/dart/sdk/lib/isolate/isolate.dart" }, - "mirrors": { - "patches": [ - "../../../../../../third_party/dart/runtime/lib/mirrors_patch.dart", - "../../../../../../third_party/dart/runtime/lib/mirrors_impl.dart", - "../../../../../../third_party/dart/runtime/lib/mirror_reference.dart" - ], - "uri": "../../../../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - }, "_vmservice": { "uri": "../../../../../../third_party/dart/sdk/lib/vmservice/vmservice.dart" }, + "wasm": { + "patches": [ + "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" + ], + "uri": "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" + }, "io": { "patches": [ "../../../../../../third_party/dart/runtime/bin/common_patch.dart", @@ -158,4 +164,4 @@ } } } -} +} \ No newline at end of file diff --git a/shell/platform/fuchsia/flutter/kernel/libraries.yaml b/shell/platform/fuchsia/flutter/kernel/libraries.yaml index 6b71da9e1abb2..f8385ca29e4b2 100644 --- a/shell/platform/fuchsia/flutter/kernel/libraries.yaml +++ b/shell/platform/fuchsia/flutter/kernel/libraries.yaml @@ -91,6 +91,11 @@ flutter_runner: - "../../../../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart" - "../../../../../../third_party/dart/runtime/lib/ffi_patch.dart" + wasm: + uri: "../../../../../../third_party/dart/sdk/lib/wasm/wasm.dart" + patches: + - "../../../../../../third_party/dart/runtime/lib/wasm_patch.dart" + _http: uri: "../../../../../../third_party/dart/sdk/lib/_http/http.dart" diff --git a/sky/packages/sky_engine/lib/_embedder.yaml b/sky/packages/sky_engine/lib/_embedder.yaml index 6b4358ce02788..6f9c1a2b770e4 100644 --- a/sky/packages/sky_engine/lib/_embedder.yaml +++ b/sky/packages/sky_engine/lib/_embedder.yaml @@ -5,6 +5,7 @@ embedded_libs: "dart:core": "core/core.dart" "dart:developer": "developer/developer.dart" "dart:ffi": "ffi/ffi.dart" + "dart:wasm": "wasm/wasm.dart" "dart:io": "io/io.dart" "dart:isolate": "isolate/isolate.dart" "dart:math": "math/math.dart" From 52ca7723e2012f4e62f1d464a289a48609b48375 Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Thu, 29 Aug 2019 21:29:31 +0200 Subject: [PATCH 2/2] update ci/licenses_golden/licenses_third_party --- ci/licenses_golden/licenses_third_party | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index c4e616caed06a..1e6769d9eacbb 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 742116b952b7acf5cf98fe3e4d537e83 +Signature: 29342bb1ee5e5375db5f5c9f613ac7a5 UNUSED LICENSES: @@ -7431,6 +7431,8 @@ FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.cc FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart FILE: ../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart FILE: ../../../third_party/dart/runtime/lib/ffi_patch.dart +FILE: ../../../third_party/dart/runtime/lib/wasm.cc +FILE: ../../../third_party/dart/runtime/lib/wasm_patch.dart FILE: ../../../third_party/dart/runtime/llvm_codegen/bit/bit.h FILE: ../../../third_party/dart/runtime/llvm_codegen/bit/main.cc FILE: ../../../third_party/dart/runtime/llvm_codegen/bit/test.cc @@ -7544,6 +7546,7 @@ 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 +FILE: ../../../third_party/dart/sdk/lib/wasm/wasm.dart ---------------------------------------------------------------------------------------------------- Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file for details. All rights reserved.