Don't use --no-preview-dart-2
Fixes https://github.com/dart-lang/sdk/issues/34548
Change-Id: Ia6b4a3cdc4b6c39e0aa0fb649940b2bd126a619e
Reviewed-on: https://dart-review.googlesource.com/76120
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Peter von der Ahé <ahe@google.com>
diff --git a/pkg/front_end/test/fasta/tool_test.dart b/pkg/front_end/test/fasta/tool_test.dart
index 21805d7..d94ba75 100644
--- a/pkg/front_end/test/fasta/tool_test.dart
+++ b/pkg/front_end/test/fasta/tool_test.dart
@@ -15,18 +15,15 @@
const List<String> subtools = const <String>[
"abcompile",
- "analyzer-compile",
"compile",
"compile-platform",
"log",
"logd",
"outline",
"parser",
- "run",
"scanner",
"dump-partial",
"dump-ir",
- "kernel-service",
"testing",
"generate-messages",
];
@@ -65,12 +62,6 @@
""",
"stderr": "",
},
- "analyzer-compile": {
- "exitCode": 2,
- "stdout": "",
- "stderr": "'analyzer-compile' isn't supported anymore,"
- " please use 'compile' instead.\n",
- },
"compile": {
"exitCode": 1,
"stdout": """
@@ -120,12 +111,6 @@
"stdout": "",
"stderr": "",
},
- "run": {
- "exitCode": 2,
- "stdout": "",
- "stderr": "'run' isn't supported anymore,"
- " please use 'kernel-service' instead.\n",
- },
"scanner": {
"exitCode": 0,
"stderr": "",
@@ -141,10 +126,6 @@
"stdout": "",
"stderr": "Usage: dump-ir dillfile [output]\n",
},
- "kernel-service": {
- "exitCode": 255,
- "stdout": "",
- },
};
for (String subtool in testedSubtools) {
@@ -167,11 +148,6 @@
Expect.stringEquals(expectation["stderr"], result.stderr);
break;
- case "kernel-service":
- Expect.stringEquals(expectation["stdout"], result.stdout);
- Expect.isTrue(result.stderr.startsWith("Usage: dart ["));
- break;
-
default:
Expect.stringEquals(expectation["stdout"], result.stdout);
Expect.stringEquals(expectation["stderr"], result.stderr);
diff --git a/pkg/front_end/test/whole_program_test.dart b/pkg/front_end/test/whole_program_test.dart
index d342a04..9c63521 100644
--- a/pkg/front_end/test/whole_program_test.dart
+++ b/pkg/front_end/test/whole_program_test.dart
@@ -56,7 +56,6 @@
final List<String> arguments = <String>[
'--packages=${packagesFile.toFilePath()}',
- '--no_preview_dart_2',
'-c',
compiler.toFilePath(),
'--platform=${platformDill.toFilePath()}',
diff --git a/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart b/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart
index 2f00335..90a9f5f 100644
--- a/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart
+++ b/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart
@@ -22,7 +22,6 @@
Uri platformDill = tmp.resolve("vm_platform.dill");
Uri outlineDill = tmp.resolve("vm_outline_strong.dill");
ProcessResult result = await Process.run(dartVm.toFilePath(), <String>[
- "--no_preview_dart_2",
compilePlatform.toFilePath(),
"-v",
"dart:core",
diff --git a/pkg/front_end/tool/_fasta/compile_platform_test.dart b/pkg/front_end/tool/_fasta/compile_platform_test.dart
index d36b852..b528f4e 100644
--- a/pkg/front_end/tool/_fasta/compile_platform_test.dart
+++ b/pkg/front_end/tool/_fasta/compile_platform_test.dart
@@ -22,7 +22,6 @@
Uri platformDill = tmp.resolve("vm_platform.dill");
Uri outlineDill = tmp.resolve("vm_outline_strong.dill");
ProcessResult result = await Process.run(dartVm.toFilePath(), <String>[
- "--no_preview_dart_2",
compilePlatform.toFilePath(),
"-v",
"--strong",
diff --git a/pkg/front_end/tool/_fasta/dump_partial.dart b/pkg/front_end/tool/_fasta/dump_partial.dart
index 9f8bef0..875e62b 100644
--- a/pkg/front_end/tool/_fasta/dump_partial.dart
+++ b/pkg/front_end/tool/_fasta/dump_partial.dart
@@ -4,9 +4,17 @@
/// Utility to dump a truncated .dill file generated by the incremental kernel
/// generator or by the VM's kernel service.
-import 'dart:io';
-import 'package:kernel/kernel.dart';
-import 'package:front_end/src/fasta/kernel/utils.dart';
+
+import 'dart:io' show File, exitCode;
+
+import 'package:kernel/kernel.dart'
+ show
+ Component,
+ loadComponentFromBinary,
+ loadComponentFromBytes,
+ writeComponentToText;
+
+import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent;
main(List<String> args) {
if (args.length == 0) {
diff --git a/pkg/front_end/tool/fasta b/pkg/front_end/tool/fasta
index 32485f4..2567a4e 100755
--- a/pkg/front_end/tool/fasta
+++ b/pkg/front_end/tool/fasta
@@ -25,18 +25,12 @@
case "${1//_/-}" in
abcompile) SCRIPT="${TOOL_DIR}/abcompile.dart";;
- analyzer-compile)
- stop "'$1' isn't supported anymore, please use 'compile' instead."
- ;;
compile) SCRIPT="${TOOL_DIR}/compile.dart";;
compile-platform) SCRIPT="${TOOL_DIR}/compile_platform.dart";;
log) SCRIPT="${TOOL_DIR}/log_analyzer.dart";;
logd) SCRIPT="${TOOL_DIR}/log_collector.dart";;
outline) SCRIPT="${TOOL_DIR}/outline.dart";;
parser) SCRIPT="${TOOL_DIR}/parser.dart";;
- run)
- stop "'$1' isn't supported anymore, please use 'kernel-service' instead."
- ;;
scanner) SCRIPT="${TOOL_DIR}/scanner.dart";;
dump-partial) SCRIPT="${TOOL_DIR}/dump_partial.dart";;
dump-ir)
@@ -49,13 +43,6 @@
stop "Usage: $1 dillfile [output]"
fi
;;
- kernel-service)
- shift
- PATCHED_SDK_DIR=$(
- ls -d {xcodebuild,out}/${DART_CONFIGURATION} 2>/dev/null \
- | head -1)
- exec "${DART_VM}" --preview_dart_2 -DDFE_VERBOSE=true "$@"
- ;;
testing)
SCRIPT="${REPO_DIR}/pkg/testing/bin/testing.dart"
set -- "$@" "--config=${REPO_DIR}/pkg/front_end/testing.json"
@@ -68,4 +55,4 @@
shift
-exec "${DART_VM}" --no_preview_dart_2 -c "${SCRIPT}" "$@"
+exec "${DART_VM}" -c "${SCRIPT}" "$@"
