Version 2.18.0-102.0.dev
Merge commit '542aee1e5171013d6dd2dd8e36ab3a6b5376291d' into 'dev'
diff --git a/BUILD.gn b/BUILD.gn
index 4b587be..aad296d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -103,6 +103,15 @@
deps = [ "utils/compiler:dart2js" ]
}
+group("dart2wasm") {
+ deps = [
+ ":runtime_precompiled",
+ "utils/dart2wasm:compile_dart2wasm_platform",
+ "utils/dart2wasm:dart2wasm_asserts_snapshot",
+ "utils/dart2wasm:dart2wasm_snapshot",
+ ]
+}
+
group("dartanalyzer") {
deps = [ "utils/dartanalyzer" ]
}
diff --git a/DEPS b/DEPS
index 1aceb3c..b6d3a6b 100644
--- a/DEPS
+++ b/DEPS
@@ -44,7 +44,7 @@
# co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
# hashes. It requires access to the dart-build-access group, which EngProd
# has.
- "co19_rev": "8f22acf210970dfe32750351031281af88b41708",
+ "co19_rev": "9849573cd1b8317e58247b8c1672e89b1cd842e2",
# This line prevents conflicts when both packages are rolled simultaneously.
"co19_2_rev": "b2034a17609472e374623f3dbe0efd9f5cb258af",
diff --git a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
index 36c0cb7..fc99416 100644
--- a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
@@ -4124,7 +4124,7 @@
Read the SDK platform from <file>, which should be in Dill/Kernel IR format
and contain the Dart SDK.
- --target=dart2js|dart2js_server|dart_runner|dartdevc|flutter|flutter_runner|none|vm
+ --target=dart2js|dart2js_server|dart2wasm|dart_runner|dartdevc|flutter|flutter_runner|none|vm
Specify the target configuration.
--enable-asserts
diff --git a/pkg/dart2wasm/bin/dart2wasm.dart b/pkg/dart2wasm/bin/dart2wasm.dart
index 6a77001..4a382a9 100644
--- a/pkg/dart2wasm/bin/dart2wasm.dart
+++ b/pkg/dart2wasm/bin/dart2wasm.dart
@@ -40,6 +40,7 @@
print("");
print("Options:");
print(" --dart-sdk=<path>");
+ print(" --platform=<path>");
print("");
for (String option in boolOptionMap.keys) {
print(" --[no-]$option");
@@ -55,6 +56,7 @@
Future<int> main(List<String> args) async {
Uri sdkPath = Platform.script.resolve("../../../sdk");
+ Uri? platformPath = null;
TranslatorOptions options = TranslatorOptions();
List<String> nonOptions = [];
void Function(TranslatorOptions, int)? intOptionFun = null;
@@ -65,6 +67,9 @@
} else if (arg.startsWith("--dart-sdk=")) {
String path = arg.substring("--dart-sdk=".length);
sdkPath = Uri.file(Directory(path).absolute.path);
+ } else if (arg.startsWith("--platform=")) {
+ String path = arg.substring("--platform=".length);
+ platformPath = Uri.file(Directory(path).absolute.path);
} else if (arg.startsWith("--no-")) {
var optionFun = boolOptionMap[arg.substring(5)];
if (optionFun == null) usage("Unknown option $arg");
@@ -95,8 +100,8 @@
String output = nonOptions[1];
Uri mainUri = resolveInputUri(input);
- Uint8List? module = await compileToModule(mainUri, sdkPath, options,
- (message) => printDiagnosticMessage(message, print));
+ Uint8List? module = await compileToModule(mainUri, sdkPath, platformPath,
+ options, (message) => printDiagnosticMessage(message, print));
if (module == null) {
exitCode = 1;
diff --git a/pkg/dart2wasm/dart2wasm.md b/pkg/dart2wasm/dart2wasm.md
index 8cc6b91..6d3ab61 100644
--- a/pkg/dart2wasm/dart2wasm.md
+++ b/pkg/dart2wasm/dart2wasm.md
@@ -11,6 +11,7 @@
| Option | Default | Description |
| --------------------------------------- | ------- | ----------- |
| `--dart-sdk=`*path* | relative to script | The location of the `sdk` directory inside the Dart SDK, containing the core library sources.
+| `--platform=`*path* | none | The location of the platform `dill` file containing the compiled core libraries.
| `--`[`no-`]`export-all` | no | Export all functions; otherwise, just export `main`.
| `--`[`no-`]`import-shared-memory` | no | Import a shared memory buffer. If this is on, `--shared-memory-max-pages` must also be specified.
| `--`[`no-`]`inlining` | no | Inline small functions.
diff --git a/pkg/dart2wasm/lib/compile.dart b/pkg/dart2wasm/lib/compile.dart
index 6e2c88b..f8c4739 100644
--- a/pkg/dart2wasm/lib/compile.dart
+++ b/pkg/dart2wasm/lib/compile.dart
@@ -33,6 +33,7 @@
Future<Uint8List?> compileToModule(
Uri mainUri,
Uri sdkRoot,
+ Uri? platformDill,
TranslatorOptions options,
void Function(DiagnosticMessage) handleDiagnosticMessage) async {
var succeeded = true;
@@ -46,13 +47,18 @@
Target target = WasmTarget();
CompilerOptions compilerOptions = CompilerOptions()
..target = target
- ..compileSdk = true
..sdkRoot = sdkRoot
..environmentDefines = {}
..verbose = false
..onDiagnostic = diagnosticMessageHandler
..nnbdMode = NnbdMode.Strong;
+ if (platformDill != null) {
+ compilerOptions.sdkSummary = platformDill;
+ } else {
+ compilerOptions.compileSdk = true;
+ }
+
CompilerResult? compilerResult =
await kernelForProgram(mainUri, compilerOptions);
if (compilerResult == null || !succeeded) {
diff --git a/pkg/dart2wasm/lib/target.dart b/pkg/dart2wasm/lib/target.dart
index 7d71097..5c7c4ea 100644
--- a/pkg/dart2wasm/lib/target.dart
+++ b/pkg/dart2wasm/lib/target.dart
@@ -51,6 +51,8 @@
'dart:nativewrappers',
'dart:js_util_wasm',
'dart:js_wasm',
+ 'dart:wasm',
+ 'dart:developer',
];
@override
diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml
index 887e231..abf6263 100644
--- a/pkg/front_end/messages.yaml
+++ b/pkg/front_end/messages.yaml
@@ -1964,7 +1964,7 @@
Read the SDK platform from <file>, which should be in Dill/Kernel IR format
and contain the Dart SDK.
- --target=dart2js|dart2js_server|dart_runner|dartdevc|flutter|flutter_runner|none|vm
+ --target=dart2js|dart2js_server|dart2wasm|dart_runner|dartdevc|flutter|flutter_runner|none|vm
Specify the target configuration.
--enable-asserts
diff --git a/pkg/front_end/pubspec.yaml b/pkg/front_end/pubspec.yaml
index 4fff6ab..47e743c 100644
--- a/pkg/front_end/pubspec.yaml
+++ b/pkg/front_end/pubspec.yaml
@@ -23,6 +23,8 @@
path: ../build_integration
compiler:
path: ../compiler
+ dart2wasm:
+ path: ../dart2wasm
dart_style: ^2.0.0
dev_compiler:
path: ../dev_compiler
diff --git a/pkg/front_end/test/spell_checking_list_common.txt b/pkg/front_end/test/spell_checking_list_common.txt
index c09bea1..815a290 100644
--- a/pkg/front_end/test/spell_checking_list_common.txt
+++ b/pkg/front_end/test/spell_checking_list_common.txt
@@ -723,6 +723,7 @@
cyclic
dart
dart2js
+dart2wasm
dartdevc
data
date
@@ -3339,6 +3340,7 @@
warning
warnings
was
+wasm
wasn't
way
ways
diff --git a/pkg/front_end/tool/_fasta/additional_targets.dart b/pkg/front_end/tool/_fasta/additional_targets.dart
index 6e9399a..13c91c2 100644
--- a/pkg/front_end/tool/_fasta/additional_targets.dart
+++ b/pkg/front_end/tool/_fasta/additional_targets.dart
@@ -10,6 +10,8 @@
import 'package:dev_compiler/src/kernel/target.dart' show DevCompilerTarget;
+import 'package:dart2wasm/target.dart' show WasmTarget;
+
import 'package:vm/target/install.dart' as vm_target_install
show installAdditionalTargets;
@@ -21,5 +23,6 @@
targets["dart2js_server"] =
(TargetFlags flags) => new Dart2jsTarget("dart2js_server", flags);
targets["dartdevc"] = (TargetFlags flags) => new DevCompilerTarget(flags);
+ targets["dart2wasm"] = (TargetFlags flags) => new WasmTarget();
vm_target_install.installAdditionalTargets();
}
diff --git a/sdk/bin/dart2wasm b/sdk/bin/dart2wasm
index 893fcda..1cebe5a 100755
--- a/sdk/bin/dart2wasm
+++ b/sdk/bin/dart2wasm
@@ -19,21 +19,39 @@
PROG_NAME="$(follow_links "$BASH_SOURCE")"
# Handle the case where dart-sdk/bin has been symlinked to.
-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
-SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
+PROG_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+SDK_DIR="$(cd "${PROG_DIR}/../.." ; pwd -P)"
+# Locate build directory, containing executables, snapshots and platform dill.
+if [[ `uname` == 'Darwin' ]]; then
+ OUT_DIR="$SDK_DIR/xcodebuild"
+else
+ OUT_DIR="$SDK_DIR/out"
+fi
+DART_CONFIGURATION=${DART_CONFIGURATION:-ReleaseX64}
+BIN_DIR="$OUT_DIR/$DART_CONFIGURATION"
+
+DART_PRECOMPILED_RUNTIME="$BIN_DIR/dart_precompiled_runtime"
+
+# Point to SDK directory.
SDK_ARG="--dart-sdk=$SDK_DIR"
-DART="$BIN_DIR/dart"
+# Point to built platform dill.
+PLATFORM="$BIN_DIR/dart2wasm_platform.dill"
+PLATFORM_ARG="--platform=$PLATFORM"
unset EXTRA_VM_OPTIONS
declare -a EXTRA_VM_OPTIONS
+# Choose snapshot with or without asserts enabled.
+SNAPSHOT_NAME="dart2wasm"
case $0 in
*_developer)
EXTRA_VM_OPTIONS+=('--enable_asserts')
+ SNAPSHOT_NAME="dart2wasm_asserts"
;;
esac
+SNAPSHOT="$BIN_DIR/$SNAPSHOT_NAME.snapshot"
# We allow extra vm options to be passed in through an environment variable.
if [[ $DART_VM_OPTIONS ]]; then
@@ -43,6 +61,4 @@
DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
-DART2WASM_COMPILER="$DART_ROOT/pkg/dart2wasm/bin/dart2wasm.dart"
-
-exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$DART2WASM_COMPILER" "$SDK_ARG" "$@"
+exec "$DART_PRECOMPILED_RUNTIME" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$SNAPSHOT" "$SDK_ARG" "$PLATFORM_ARG" "$@"
diff --git a/tools/VERSION b/tools/VERSION
index bf5f7ca..65f3e26 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 18
PATCH 0
-PRERELEASE 101
+PRERELEASE 102
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index b243173..c7bcc68 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -4,7 +4,6 @@
],
"filesets": {
"analyzer_unit_tests": [
- ".packages",
".dart_tool/package_config.json",
"pkg/",
"third_party/pkg/",
@@ -14,7 +13,6 @@
"xcodebuild/ReleaseX64/dart-sdk/"
],
"web_platform": [
- ".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/dart-sdk/",
"out/ReleaseX64/dart-sdk/",
@@ -60,7 +58,6 @@
"xcodebuild/ReleaseX64/gen/utils/dartdevc/"
],
"web_platform_nnbd": [
- ".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/dart-sdk/",
"out/ReleaseX64/dart-sdk/",
@@ -98,7 +95,6 @@
"xcodebuild/ReleaseX64/gen/utils/dartdevc/"
],
"web_platform_hostasserts": [
- ".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/dart",
"out/ReleaseIA32/dart2js_platform.dill",
@@ -149,7 +145,6 @@
"xcodebuild/ReleaseX64/dart2js_platform_unsound.dill"
],
"web_platform_hostasserts_nnbd": [
- ".packages",
".dart_tool/package_config.json",
"out/ReleaseX64/dart",
"out/ReleaseX64/dart2js_platform.dill",
@@ -186,7 +181,6 @@
"xcodebuild/ReleaseX64/dart2js_platform_unsound.dill"
],
"dart2wasm_hostasserts": [
- ".packages",
".dart_tool/package_config.json",
"out/ReleaseX64/dart",
"pkg/",
@@ -219,7 +213,6 @@
"xcodebuild/ReleaseX64/dart"
],
"front-end": [
- ".packages",
".dart_tool/package_config.json",
"out/ReleaseIA32/",
"out/ReleaseX64/",
@@ -284,8 +277,7 @@
"pkg/vm/",
"runtime/",
"sdk/",
- ".dart_tool/package_config.json",
- ".packages"
+ ".dart_tool/package_config.json"
],
"vm-kernel": [
"benchmarks/",
@@ -356,7 +348,6 @@
"runtime/",
"sdk/",
".dart_tool/package_config.json",
- ".packages",
".vpython"
]
},
@@ -3026,7 +3017,8 @@
"name": "build dart",
"script": "tools/build.py",
"arguments": [
- "runtime"
+ "runtime",
+ "dart2wasm"
]
},
{
@@ -4271,4 +4263,4 @@
"macos": "buildtools/mac-x64/clang/bin/llvm-symbolizer",
"windows": "buildtools/win-x64/clang/bin/llvm-symbolizer.exe"
}
-}
\ No newline at end of file
+}
diff --git a/utils/aot_snapshot.gni b/utils/aot_snapshot.gni
new file mode 100644
index 0000000..5527528
--- /dev/null
+++ b/utils/aot_snapshot.gni
@@ -0,0 +1,118 @@
+# Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+import("../build/dart/dart_action.gni")
+import("../sdk_args.gni")
+
+_dart_root = get_path_info("..", "abspath")
+
+template("aot_snapshot") {
+ assert(defined(invoker.main_dart), "Must specify 'main_dart'")
+ gen_kernel_args = []
+ if (defined(invoker.gen_kernel_args)) {
+ gen_kernel_args = invoker.gen_kernel_args
+ }
+ gen_snapshot_args = []
+ if (defined(invoker.gen_snapshot_args)) {
+ gen_snapshot_args = invoker.gen_snapshot_args
+ }
+ main_dart = invoker.main_dart
+ name = target_name
+ if (defined(invoker.name)) {
+ name = invoker.name
+ }
+ extra_deps = []
+ if (defined(invoker.deps)) {
+ extra_deps += invoker.deps
+ }
+ extra_inputs = [ main_dart ]
+ if (defined(invoker.inputs)) {
+ extra_inputs += invoker.inputs
+ }
+ if (defined(invoker.dot_packages)) {
+ dot_packages = invoker.dot_packages
+ } else {
+ dot_packages = rebase_path("$_dart_root/.dart_tool/package_config.json")
+ }
+ output = "$root_out_dir/$name.snapshot"
+ if (defined(invoker.output)) {
+ output = invoker.output
+ }
+
+ dill = "$target_gen_dir/$name.dart.dill"
+
+ # Build the kernel file using the prebuilt VM to speed up the debug and
+ # simulator builds.
+ prebuilt_dart_action(target_name + "_dill") {
+ if (defined(invoker.pool)) {
+ pool = invoker.pool
+ }
+ deps = extra_deps + [
+ "$_dart_root/runtime/vm:kernel_platform_files($host_toolchain)",
+ "$_dart_root/runtime/vm:vm_platform",
+ "$_dart_root/utils/gen_kernel:bootstrap_gen_kernel",
+ ]
+ gen_kernel_kernel =
+ get_label_info("$_dart_root/utils/gen_kernel:bootstrap_gen_kernel",
+ "target_gen_dir") + "/bootstrap_gen_kernel.dill"
+ platform_dill = "$root_out_dir/vm_platform_strong.dill"
+
+ inputs = extra_inputs + [
+ gen_kernel_kernel,
+ platform_dill,
+ main_dart,
+ dot_packages,
+ ]
+ output = dill
+ outputs = [ output ]
+
+ depfile = "$output.d"
+
+ vm_args = [
+ # Ensure gen_kernel.dart will use this SDK hash when consuming/producing kernel.
+ "-Dsdk_hash=$sdk_hash",
+ ]
+
+ script = gen_kernel_kernel
+
+ args = [
+ "--packages=" + rebase_path(dot_packages),
+ "--platform=" + rebase_path(platform_dill),
+ "--aot",
+ "--output=" + rebase_path(output, root_build_dir),
+ "--depfile=" + rebase_path(depfile),
+
+ # Ensure the compiled appliation (e.g. kernel-service, frontend-server,
+ # ...) will use this SDK hash when consuming/producing kernel.
+ #
+ # (Instead of ensuring every user of the "application_snapshot" /
+ # "kernel_snapshot" passes this if needed, we always pass it)
+ "-Dsdk_hash=$sdk_hash",
+ ]
+ args += gen_kernel_args
+ args += [ rebase_path(main_dart) ]
+ }
+
+ # Create a snapshot from kernel built above.
+ gen_snapshot_action(target_name) {
+ if (defined(invoker.pool)) {
+ pool = invoker.pool
+ }
+ deps = extra_deps + [ ":${target_name}_dill" ]
+
+ inputs = extra_inputs
+
+ outputs = [ output ]
+
+ abs_output = rebase_path(output)
+
+ vm_args = [
+ "--deterministic",
+ "--snapshot-kind=app-aot-elf",
+ "--elf=$abs_output",
+ ] + gen_snapshot_args
+
+ args = [ rebase_path(dill) ]
+ }
+}
diff --git a/utils/dart2wasm/BUILD.gn b/utils/dart2wasm/BUILD.gn
new file mode 100644
index 0000000..428922f
--- /dev/null
+++ b/utils/dart2wasm/BUILD.gn
@@ -0,0 +1,38 @@
+# Copyright (c) 2022, the Dart project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+import("../aot_snapshot.gni")
+import("../compile_platform.gni")
+
+sdk_root = "../../sdk"
+
+aot_snapshot("dart2wasm_snapshot") {
+ main_dart = "../../pkg/dart2wasm/bin/dart2wasm.dart"
+ name = "dart2wasm"
+}
+
+aot_snapshot("dart2wasm_asserts_snapshot") {
+ main_dart = "../../pkg/dart2wasm/bin/dart2wasm.dart"
+ name = "dart2wasm_asserts"
+ gen_kernel_args = [ "--enable-asserts" ]
+ gen_snapshot_args = [ "--enable-asserts" ]
+}
+
+compile_platform("compile_dart2wasm_platform") {
+ single_root_scheme = "org-dartlang-sdk"
+ single_root_base = rebase_path("$sdk_root/")
+ libraries_specification_uri = "org-dartlang-sdk:///lib/libraries.json"
+
+ outputs = [
+ "$root_out_dir/dart2wasm_platform.dill",
+ "$root_out_dir/dart2wasm_outline.dill",
+ ]
+
+ args = [
+ "--target=dart2wasm",
+ "--no-defines",
+ "dart:core",
+ "--nnbd-strong",
+ ]
+}
