[dart2wasm] Remove stringref target
stringref target won't be used any time soon (probably ever). To help with build times and avoid keeping it updated remove it for now. Change-Id: I0df33b7ab2e19bae5090e8ea32ea6a3dc3751652 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/334881 Reviewed-by: Aske Simon Christensen <askesc@google.com> Commit-Queue: Ömer Ağacan <omersa@google.com>
This commit is contained in:
committed by
Commit Queue
parent
ad768fb480
commit
75c975fe6d
@@ -108,7 +108,6 @@ group("dart2wasm_platform") {
|
||||
":runtime_precompiled",
|
||||
"utils/dart2wasm:compile_dart2wasm_js_compatibility_platform",
|
||||
"utils/dart2wasm:compile_dart2wasm_platform",
|
||||
"utils/dart2wasm:compile_dart2wasm_stringref_platform",
|
||||
"utils/dart2wasm:dart2wasm_snapshot",
|
||||
]
|
||||
if (defined(is_product)) {
|
||||
|
||||
@@ -4743,7 +4743,7 @@ const MessageCode messageFastaUsageLong =
|
||||
Read the SDK platform from <file>, which should be in Dill/Kernel IR format
|
||||
and contain the Dart SDK.
|
||||
|
||||
--target=dart2js|dart2js_server|dart2wasm|dart2wasm_js_compatibility|dart2wasm_stringref|dart_runner|dartdevc|flutter|flutter_runner|none|vm
|
||||
--target=dart2js|dart2js_server|dart2wasm|dart2wasm_js_compatibility|dart_runner|dartdevc|flutter|flutter_runner|none|vm
|
||||
Specify the target configuration.
|
||||
|
||||
--enable-asserts
|
||||
|
||||
@@ -37,7 +37,6 @@ where *options* include:
|
||||
| `--`[`no-`]`polymorphic-specialization` | no | Do virtual calls by switching on the class ID instead of using `call_indirect`.
|
||||
| `--`[`no-`]`print-kernel` | no | Print IR for each function before compiling it.
|
||||
| `--`[`no-`]`print-wasm` | no | Print Wasm instructions of each compiled function.
|
||||
| `--`[`no-`]`stringref` | no | Use the experimental stringref Wasm proposal.
|
||||
| `--`[`no-`]`enable-asserts` | no | Enable assertions at runtime.
|
||||
| `--`[`no-`]`js-compatibility` | no | Enable JS compatibility mode.
|
||||
| `--shared-memory-max-pages` *pagecount* | | Max size of the imported memory buffer. If `--shared-import-memory` is specified, this must also be specified.
|
||||
|
||||
@@ -69,9 +69,7 @@ Future<CompilerOutput?> compileToModule(compiler.CompilerOptions options,
|
||||
}
|
||||
|
||||
final wasm.Mode mode;
|
||||
if (options.translatorOptions.useStringref) {
|
||||
mode = wasm.Mode.stringref;
|
||||
} else if (options.translatorOptions.jsCompatibility) {
|
||||
if (options.translatorOptions.jsCompatibility) {
|
||||
mode = wasm.Mode.jsCompatibility;
|
||||
} else {
|
||||
mode = wasm.Mode.regular;
|
||||
|
||||
@@ -34,8 +34,6 @@ final List<Option> options = [
|
||||
defaultsTo: _d.translatorOptions.printKernel),
|
||||
Flag("print-wasm", (o, value) => o.translatorOptions.printWasm = value,
|
||||
defaultsTo: _d.translatorOptions.printWasm),
|
||||
Flag("stringref", (o, value) => o.translatorOptions.useStringref = value,
|
||||
defaultsTo: _d.translatorOptions.useStringref),
|
||||
Flag("js-compatibility",
|
||||
(o, value) => o.translatorOptions.jsCompatibility = value,
|
||||
defaultsTo: _d.translatorOptions.jsCompatibility),
|
||||
|
||||
@@ -36,7 +36,6 @@ import 'package:dart2wasm/transformers.dart' as wasmTrans;
|
||||
|
||||
enum Mode {
|
||||
regular,
|
||||
stringref,
|
||||
jsCompatibility,
|
||||
}
|
||||
|
||||
@@ -122,8 +121,6 @@ class WasmTarget extends Target {
|
||||
switch (mode) {
|
||||
case Mode.regular:
|
||||
return 'wasm';
|
||||
case Mode.stringref:
|
||||
return 'wasm_stringref';
|
||||
case Mode.jsCompatibility:
|
||||
return 'wasm_js_compatibility';
|
||||
}
|
||||
@@ -133,8 +130,6 @@ class WasmTarget extends Target {
|
||||
switch (mode) {
|
||||
case Mode.regular:
|
||||
return 'dart2wasm_platform.dill';
|
||||
case Mode.stringref:
|
||||
return 'dart2wasm_stringref_platform.dill';
|
||||
case Mode.jsCompatibility:
|
||||
return 'dart2wasm_js_compatibility_platform.dill';
|
||||
}
|
||||
|
||||
@@ -75,17 +75,6 @@ String? computePlatformDillName(
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'wasm_stringref':
|
||||
switch (nnbdMode) {
|
||||
case NnbdMode.Strong:
|
||||
return 'dart2wasm_stringref_outline.dill';
|
||||
//TODO(johnniwinther): Support using the full dill.
|
||||
//return 'dart2wasm_stringref_platform.dill';
|
||||
case NnbdMode.Weak:
|
||||
case NnbdMode.Agnostic:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'wasm_js_compatibility':
|
||||
switch (nnbdMode) {
|
||||
case NnbdMode.Strong:
|
||||
|
||||
@@ -2359,7 +2359,7 @@ FastaUsageLong:
|
||||
Read the SDK platform from <file>, which should be in Dill/Kernel IR format
|
||||
and contain the Dart SDK.
|
||||
|
||||
--target=dart2js|dart2js_server|dart2wasm|dart2wasm_js_compatibility|dart2wasm_stringref|dart_runner|dartdevc|flutter|flutter_runner|none|vm
|
||||
--target=dart2js|dart2js_server|dart2wasm|dart2wasm_js_compatibility|dart_runner|dartdevc|flutter|flutter_runner|none|vm
|
||||
Specify the target configuration.
|
||||
|
||||
--enable-asserts
|
||||
|
||||
@@ -739,7 +739,6 @@ dart
|
||||
dart2js
|
||||
dart2wasm
|
||||
dart2wasm_js_compatibility
|
||||
dart2wasm_stringref
|
||||
dartdevc
|
||||
data
|
||||
date
|
||||
@@ -2929,7 +2928,6 @@ stray
|
||||
stream
|
||||
strictly
|
||||
string
|
||||
stringref
|
||||
strings
|
||||
stripped
|
||||
strong
|
||||
|
||||
@@ -26,8 +26,6 @@ void installAdditionalTargets() {
|
||||
(TargetFlags flags) => new Dart2jsTarget("dart2js_server", flags);
|
||||
targets["dartdevc"] = (TargetFlags flags) => new DevCompilerTarget(flags);
|
||||
targets["dart2wasm"] = (TargetFlags flags) => new WasmTarget();
|
||||
targets["dart2wasm_stringref"] =
|
||||
(TargetFlags flags) => new WasmTarget(mode: wasm.Mode.stringref);
|
||||
targets["dart2wasm_js_compatibility"] =
|
||||
(TargetFlags flags) => new WasmTarget(mode: wasm.Mode.jsCompatibility);
|
||||
vm_target_install.installAdditionalTargets();
|
||||
|
||||
@@ -69,8 +69,6 @@ declare_args() {
|
||||
# ........dart2js_server_platform_unsound.dill
|
||||
# ........dart2wasm_outline.dill (if not on ia32)
|
||||
# ........dart2wasm_platform.dill (if not on ia32)
|
||||
# ........dart2wasm_stringref_outline.dill (if not on ia32)
|
||||
# ........dart2wasm_stringref_platform.dill (if not on ia32)
|
||||
# ........dart2wasm_js_compatibility_outline.dill (if not on ia32)
|
||||
# ........dart2wasm_js_compatibility_platform.dill (if not on ia32)
|
||||
# ........ddc_outline.dill
|
||||
@@ -524,15 +522,12 @@ copy("copy_dart2wasm_platform") {
|
||||
"../:dart2wasm_platform",
|
||||
"../utils/dart2wasm:compile_dart2wasm_js_compatibility_platform",
|
||||
"../utils/dart2wasm:compile_dart2wasm_platform",
|
||||
"../utils/dart2wasm:compile_dart2wasm_stringref_platform",
|
||||
]
|
||||
sources = [
|
||||
"$root_out_dir/dart2wasm_js_compatibility_outline.dill",
|
||||
"$root_out_dir/dart2wasm_js_compatibility_platform.dill",
|
||||
"$root_out_dir/dart2wasm_outline.dill",
|
||||
"$root_out_dir/dart2wasm_platform.dill",
|
||||
"$root_out_dir/dart2wasm_stringref_outline.dill",
|
||||
"$root_out_dir/dart2wasm_stringref_platform.dill",
|
||||
]
|
||||
outputs =
|
||||
[ "$root_out_dir/$dart_sdk_output/lib/_internal/{{source_file_part}}" ]
|
||||
|
||||
@@ -95,9 +95,6 @@ fi
|
||||
# Not the prettiest way to check for a target, and it doesn't support changing
|
||||
# the default, but it will do for experiments.
|
||||
for arg in "${ARGS[@]}"; do
|
||||
if [[ "$arg" == "--stringref" ]]; then
|
||||
PLATFORM="$BIN_DIR/dart2wasm_stringref_platform.dill"
|
||||
fi
|
||||
if [[ "$arg" == "--js-compatibility" ]]; then
|
||||
PLATFORM="$BIN_DIR/dart2wasm_js_compatibility_platform.dill"
|
||||
fi
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -150,37 +150,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"wasm_stringref": {
|
||||
"include": [
|
||||
{
|
||||
"target": "wasm_base"
|
||||
}
|
||||
],
|
||||
"libraries": {
|
||||
"core": {
|
||||
"uri": "core/core.dart",
|
||||
"patches": [
|
||||
"_internal/vm_shared/lib/array_patch.dart",
|
||||
"_internal/vm_shared/lib/bigint_patch.dart",
|
||||
"_internal/vm_shared/lib/bool_patch.dart",
|
||||
"_internal/vm_shared/lib/date_patch.dart",
|
||||
"_internal/vm_shared/lib/map_patch.dart",
|
||||
"_internal/vm_shared/lib/null_patch.dart",
|
||||
"_internal/wasm/lib/boxed_double.dart",
|
||||
"_internal/wasm/lib/boxed_int.dart",
|
||||
"_internal/wasm/lib/boxed_int_to_string.dart",
|
||||
"_internal/wasm/lib/core_patch.dart",
|
||||
"_internal/wasm/lib/date_patch_patch.dart",
|
||||
"_internal/wasm/lib/int_common_patch.dart",
|
||||
"_internal/wasm/lib/int_patch.dart",
|
||||
"_internal/wasm/lib/string_buffer_patch.dart",
|
||||
"_internal/wasm/lib/string_stringref_patch.dart",
|
||||
"_internal/wasm/lib/sync_star_patch.dart",
|
||||
"_internal/wasm/lib/weak_patch.dart"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"wasm_js_compatibility": {
|
||||
"include": [
|
||||
{
|
||||
|
||||
@@ -137,31 +137,6 @@ wasm:
|
||||
- _internal/wasm/lib/sync_star_patch.dart
|
||||
- _internal/wasm/lib/weak_patch.dart
|
||||
|
||||
wasm_stringref:
|
||||
include:
|
||||
- target: "wasm_base"
|
||||
libraries:
|
||||
core:
|
||||
uri: core/core.dart
|
||||
patches:
|
||||
- _internal/vm_shared/lib/array_patch.dart
|
||||
- _internal/vm_shared/lib/bigint_patch.dart
|
||||
- _internal/vm_shared/lib/bool_patch.dart
|
||||
- _internal/vm_shared/lib/date_patch.dart
|
||||
- _internal/vm_shared/lib/map_patch.dart
|
||||
- _internal/vm_shared/lib/null_patch.dart
|
||||
- _internal/wasm/lib/boxed_double.dart
|
||||
- _internal/wasm/lib/boxed_int.dart
|
||||
- _internal/wasm/lib/boxed_int_to_string.dart
|
||||
- _internal/wasm/lib/core_patch.dart
|
||||
- _internal/wasm/lib/date_patch_patch.dart
|
||||
- _internal/wasm/lib/int_common_patch.dart
|
||||
- _internal/wasm/lib/int_patch.dart
|
||||
- _internal/wasm/lib/string_buffer_patch.dart
|
||||
- _internal/wasm/lib/string_stringref_patch.dart
|
||||
- _internal/wasm/lib/sync_star_patch.dart
|
||||
- _internal/wasm/lib/weak_patch.dart
|
||||
|
||||
wasm_js_compatibility:
|
||||
include:
|
||||
- target: "wasm_common"
|
||||
|
||||
@@ -122,8 +122,6 @@
|
||||
"out/ReleaseX64/dart2wasm_asserts.snapshot",
|
||||
"out/ReleaseX64/dart2wasm_outline.dill",
|
||||
"out/ReleaseX64/dart2wasm_platform.dill",
|
||||
"out/ReleaseX64/dart2wasm_stringref_outline.dill",
|
||||
"out/ReleaseX64/dart2wasm_stringref_platform.dill",
|
||||
"out/ReleaseX64/dart2wasm_js_compatibility_outline.dill",
|
||||
"out/ReleaseX64/dart2wasm_js_compatibility_platform.dill",
|
||||
"out/ReleaseX64/wasm/",
|
||||
|
||||
@@ -59,24 +59,6 @@ compile_platform("compile_dart2wasm_platform") {
|
||||
]
|
||||
}
|
||||
|
||||
compile_platform("compile_dart2wasm_stringref_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_stringref_platform.dill",
|
||||
"$root_out_dir/dart2wasm_stringref_outline.dill",
|
||||
]
|
||||
|
||||
args = [
|
||||
"--target=dart2wasm_stringref",
|
||||
"--no-defines",
|
||||
"dart:core",
|
||||
"--nnbd-strong",
|
||||
]
|
||||
}
|
||||
|
||||
compile_platform("compile_dart2wasm_js_compatibility_platform") {
|
||||
single_root_scheme = "org-dartlang-sdk"
|
||||
single_root_base = rebase_path("$sdk_root/")
|
||||
|
||||
Reference in New Issue
Block a user