From 808fa4ca8b5fbc3d79ade02f607b8533c9714029 Mon Sep 17 00:00:00 2001 From: Johnni Winther Date: Mon, 18 Nov 2024 07:49:01 +0000 Subject: [PATCH] [cfe] Move tool/_fasta/ to tool/ Change-Id: I5b7348fb4adb4e7f4039c91d54d712c1eb131ecf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395002 Reviewed-by: Jens Johansen Reviewed-by: Slava Egorov Commit-Queue: Johnni Winther --- build/rbe/rewrapper_dart.py | 2 +- .../test/info_visitor_test.dart | 2 +- .../lib/src/base/processed_options.dart | 7 ----- .../lib/src/testing/analysis_helper.dart | 4 +-- .../lib/src/util/parser_ast_helper.dart | 4 +-- pkg/front_end/messages.yaml | 2 +- pkg/front_end/presubmit_helper.dart | 4 +-- pkg/front_end/presubmit_helper_spawn.dart | 4 +-- .../test/ast_nodes_has_to_string_test.dart | 2 +- pkg/front_end/test/bootstrap_test.dart | 4 +-- .../test/compile_benchmark_helper.dart | 2 +- .../test/compile_platform_coverage.dart | 2 +- .../generated_files_up_to_date_git_test.dart | 8 ++--- pkg/front_end/test/kernel_binary_bench.dart | 2 +- pkg/front_end/test/messages_suite.dart | 2 +- pkg/front_end/test/types/README.md | 2 +- pkg/front_end/testing.json | 2 +- .../tool/{_fasta => }/abcompile.dart | 2 +- .../tool/{_fasta => }/additional_targets.dart | 0 .../{_fasta => }/additional_targets_test.dart | 0 pkg/front_end/tool/{_fasta => }/batch.dart | 0 .../tool/{_fasta => }/bench_maker.dart | 0 .../{_fasta => }/benchmark_visualiser.html | 0 pkg/front_end/tool/benchmarker.dart | 12 ++++---- .../tool/{_fasta => }/command_line.dart | 0 .../tool/compare_revisions_tool.dart | 4 +-- pkg/front_end/tool/{_fasta => }/compile.dart | 0 .../tool/{_fasta => }/compile_platform.dart | 0 .../compile_platform_legacy_test.dart | 2 +- .../{_fasta => }/compile_platform_test.dart | 2 +- pkg/front_end/tool/{_fasta => }/deps.dart | 0 .../tool/{_fasta => }/entry_points.dart | 2 +- pkg/front_end/tool/fasta | 2 +- pkg/front_end/tool/fasta.dart | 22 +++++++------- pkg/front_end/tool/flame/instrumenter.dart | 30 +++++++++---------- .../generate_experimental_flags.dart | 2 +- .../tool/{_fasta => }/generate_messages.dart | 2 +- .../generate_messages_failsafe.dart | 2 +- .../{_fasta => }/generate_messages_lib.dart | 0 .../tool/{_fasta => }/log_analyzer.dart | 0 .../tool/{_fasta => }/log_collector.dart | 0 pkg/front_end/tool/{_fasta => }/outline.dart | 0 pkg/front_end/tool/{_fasta => }/parser.dart | 0 .../parser_ast_helper_creator.dart | 6 ++-- pkg/front_end/tool/{_fasta => }/scanner.dart | 0 .../tool/{_fasta => }/standard_deviation.dart | 0 pkg/pkg.status | 4 --- .../lib/src/compiler_configuration.dart | 2 +- .../tool/update_static_error_tests.dart | 2 +- runtime/docs/README.md | 6 ++-- tests/macro_build/cfe_lt_test.dart | 2 +- tools/bots/flutter/compile_flutter.sh | 4 +-- utils/BUILD.gn | 2 +- utils/compile_platform.gni | 2 +- 54 files changed, 79 insertions(+), 90 deletions(-) rename pkg/front_end/tool/{_fasta => }/abcompile.dart (99%) rename pkg/front_end/tool/{_fasta => }/additional_targets.dart (100%) rename pkg/front_end/tool/{_fasta => }/additional_targets_test.dart (100%) rename pkg/front_end/tool/{_fasta => }/batch.dart (100%) rename pkg/front_end/tool/{_fasta => }/bench_maker.dart (100%) rename pkg/front_end/tool/{_fasta => }/benchmark_visualiser.html (100%) rename pkg/front_end/tool/{_fasta => }/command_line.dart (100%) rename pkg/front_end/tool/{_fasta => }/compile.dart (100%) rename pkg/front_end/tool/{_fasta => }/compile_platform.dart (100%) rename pkg/front_end/tool/{_fasta => }/compile_platform_legacy_test.dart (97%) rename pkg/front_end/tool/{_fasta => }/compile_platform_test.dart (97%) rename pkg/front_end/tool/{_fasta => }/deps.dart (100%) rename pkg/front_end/tool/{_fasta => }/entry_points.dart (99%) rename pkg/front_end/tool/{_fasta => }/generate_experimental_flags.dart (99%) rename pkg/front_end/tool/{_fasta => }/generate_messages.dart (94%) rename pkg/front_end/tool/{_fasta => }/generate_messages_failsafe.dart (95%) rename pkg/front_end/tool/{_fasta => }/generate_messages_lib.dart (100%) rename pkg/front_end/tool/{_fasta => }/log_analyzer.dart (100%) rename pkg/front_end/tool/{_fasta => }/log_collector.dart (100%) rename pkg/front_end/tool/{_fasta => }/outline.dart (100%) rename pkg/front_end/tool/{_fasta => }/parser.dart (100%) rename pkg/front_end/tool/{_fasta => }/parser_ast_helper_creator.dart (98%) rename pkg/front_end/tool/{_fasta => }/scanner.dart (100%) rename pkg/front_end/tool/{_fasta => }/standard_deviation.dart (100%) diff --git a/build/rbe/rewrapper_dart.py b/build/rbe/rewrapper_dart.py index 7e3aec5718e..87e67c6ec3d 100644 --- a/build/rbe/rewrapper_dart.py +++ b/build/rbe/rewrapper_dart.py @@ -320,7 +320,7 @@ trace to find the place to insert the appropriate support. elif arg == 'gen/utils/analysis_server/analysis_server.dart.dill': self.extra_paths.add(self.rebase(arg)) return self.parse_analysis_server() - elif arg == '../../pkg/front_end/tool/_fasta/compile_platform.dart': + elif arg == '../../pkg/front_end/tool/compile_platform.dart': self.entry_points.add(self.rebase(arg)) return self.parse_compile_platform() elif arg == '../../utils/compiler/create_snapshot_entry.dart': diff --git a/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart b/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart index 22d61bd8d99..c2fb4a9f379 100644 --- a/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart +++ b/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart @@ -76,7 +76,7 @@ void main() async { var pkgDirectory = path.dirname(path.dirname(path.dirname(path.dirname(scriptDirectory)))); var compilePath = path.canonicalize( - path.join(pkgDirectory, "front_end", "tool", "_fasta", "compile.dart")); + path.join(pkgDirectory, "front_end", "tool", "compile.dart")); var testClassesPath = path.canonicalize(path.join(scriptDirectory, "test_classes.dart")); var ddcOutlinePath = path.canonicalize(path.join( diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart index 90b87a8df3f..51b060a5834 100644 --- a/pkg/front_end/lib/src/base/processed_options.dart +++ b/pkg/front_end/lib/src/base/processed_options.dart @@ -615,13 +615,6 @@ class ProcessedOptions { Future _computeLibrarySpecification() async { String name = target.name; - // TODO(sigmund): Eek! We should get to the point where there is no - // fasta-specific targets and the target names are meaningful. - if (name.endsWith('_fasta')) { - // Coverage-ignore-block(suite): Not run. - name = name.substring(0, name.length - 6); - } - if (librariesSpecificationUri == null || !await fileSystem.entityForUri(librariesSpecificationUri!).exists()) { if (compileSdk) { diff --git a/pkg/front_end/lib/src/testing/analysis_helper.dart b/pkg/front_end/lib/src/testing/analysis_helper.dart index 76353ac4315..a56df5a64a6 100644 --- a/pkg/front_end/lib/src/testing/analysis_helper.dart +++ b/pkg/front_end/lib/src/testing/analysis_helper.dart @@ -287,7 +287,7 @@ class ClassLookup { // TODO(johnniwinther): Update this to include all files in the cfe, and not // only those reachable from 'compiler.dart'. final List cfeOnlyEntryPoints = [ - Uri.base.resolve('pkg/front_end/tool/_fasta/compile.dart') + Uri.base.resolve('pkg/front_end/tool/compile.dart') ]; /// Filter function used to only analyze cfe source code. @@ -309,7 +309,7 @@ bool cfeOnly(Uri uri) { // TODO(johnniwinther): Update this to include all files in cfe and backends, // and not only those reachable from these entry points. List cfeAndBackendsEntryPoints = [ - Uri.base.resolve('pkg/front_end/tool/_fasta/compile.dart'), + Uri.base.resolve('pkg/front_end/tool/compile.dart'), Uri.base.resolve('pkg/vm/lib/kernel_front_end.dart'), Uri.base.resolve('pkg/compiler/lib/src/dart2js.dart'), Uri.base.resolve('pkg/dev_compiler/bin/dartdevc.dart'), diff --git a/pkg/front_end/lib/src/util/parser_ast_helper.dart b/pkg/front_end/lib/src/util/parser_ast_helper.dart index 2debd37abed..72b4ef6e38c 100644 --- a/pkg/front_end/lib/src/util/parser_ast_helper.dart +++ b/pkg/front_end/lib/src/util/parser_ast_helper.dart @@ -19,9 +19,9 @@ import '../base/messages.dart'; // ignore_for_file: lines_longer_than_80_chars // THIS FILE IS AUTO GENERATED BY -// 'tool/_fasta/parser_ast_helper_creator.dart' +// 'tool/parser_ast_helper_creator.dart' // Run this command to update it: -// 'dart pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart' +// 'dart pkg/front_end/tool/parser_ast_helper_creator.dart' abstract class ParserAstNode { final String what; diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml index 12c1cbab8fa..e41a121aac3 100644 --- a/pkg/front_end/messages.yaml +++ b/pkg/front_end/messages.yaml @@ -4,7 +4,7 @@ # Run # -# dart run pkg/front_end/tool/_fasta/generate_messages.dart +# dart run pkg/front_end/tool/generate_messages.dart # # to regenerate messages after having edited this file. # diff --git a/pkg/front_end/presubmit_helper.dart b/pkg/front_end/presubmit_helper.dart index 692bcf0cf81..31b959183d1 100644 --- a/pkg/front_end/presubmit_helper.dart +++ b/pkg/front_end/presubmit_helper.dart @@ -86,8 +86,8 @@ const Set _generatedFilesUpToDateFiles = { "pkg/front_end/test/parser_test_listener.dart", "pkg/front_end/test/parser_test_parser_creator.dart", "pkg/front_end/test/parser_test_parser.dart", - "pkg/front_end/tool/_fasta/generate_messages.dart", - "pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart", + "pkg/front_end/tool/generate_messages.dart", + "pkg/front_end/tool/parser_ast_helper_creator.dart", "pkg/front_end/tool/generate_ast_coverage.dart", "pkg/front_end/tool/generate_ast_equivalence.dart", "pkg/front_end/tool/visitor_generator.dart", diff --git a/pkg/front_end/presubmit_helper_spawn.dart b/pkg/front_end/presubmit_helper_spawn.dart index 30f38d9a074..001f2ba9359 100644 --- a/pkg/front_end/presubmit_helper_spawn.dart +++ b/pkg/front_end/presubmit_helper_spawn.dart @@ -88,8 +88,8 @@ Then run that file through your debugger or similar. const ["-DfastOnly=true"], messages_suite.createContext, me: work.repoDir - .resolve("pkg/front_end/test/fasta/messages_suite.dart"), - configurationPath: "../../testing.json", + .resolve("pkg/front_end/test/messages_suite.dart"), + configurationPath: "../testing.json", logger: logger, ); return !logger.gotFailure; diff --git a/pkg/front_end/test/ast_nodes_has_to_string_test.dart b/pkg/front_end/test/ast_nodes_has_to_string_test.dart index 8da74c49fdd..43d7979a32b 100644 --- a/pkg/front_end/test/ast_nodes_has_to_string_test.dart +++ b/pkg/front_end/test/ast_nodes_has_to_string_test.dart @@ -22,7 +22,7 @@ Future main(List args) async { Class primitiveConstantClass; { - Uri input = Platform.script.resolve("../tool/_fasta/compile.dart"); + Uri input = Platform.script.resolve("../tool/compile.dart"); CompilerOptions options = helper.getOptions(); helper.TestIncrementalCompiler compiler = new helper.TestIncrementalCompiler(options, input, diff --git a/pkg/front_end/test/bootstrap_test.dart b/pkg/front_end/test/bootstrap_test.dart index 2036473e848..4d6fbb4f2a5 100644 --- a/pkg/front_end/test/bootstrap_test.dart +++ b/pkg/front_end/test/bootstrap_test.dart @@ -15,8 +15,8 @@ import 'package:testing/testing.dart' show StdioProcess; Future main() async { asyncStart(); Uri sourceCompiler = - Uri.base.resolve("pkg/front_end/tool/_fasta/compile.dart"); - Uri outline = Uri.base.resolve("pkg/front_end/tool/_fasta/outline.dart"); + Uri.base.resolve("pkg/front_end/tool/compile.dart"); + Uri outline = Uri.base.resolve("pkg/front_end/tool/outline.dart"); Directory tmp = await Directory.systemTemp.createTemp("fasta_bootstrap"); Uri compiledOnceOutput = tmp.uri.resolve("fasta1.dill"); Uri compiledTwiceOutput = tmp.uri.resolve("fasta2.dill"); diff --git a/pkg/front_end/test/compile_benchmark_helper.dart b/pkg/front_end/test/compile_benchmark_helper.dart index 95a8f540426..313ddf45dd4 100644 --- a/pkg/front_end/test/compile_benchmark_helper.dart +++ b/pkg/front_end/test/compile_benchmark_helper.dart @@ -2,7 +2,7 @@ // 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 '../tool/_fasta/entry_points.dart' show compileEntryPoint; +import '../tool/entry_points.dart' show compileEntryPoint; Future main(List arguments) async { await compileEntryPoint(arguments); diff --git a/pkg/front_end/test/compile_platform_coverage.dart b/pkg/front_end/test/compile_platform_coverage.dart index ff586f94d89..f7d2787c5ee 100644 --- a/pkg/front_end/test/compile_platform_coverage.dart +++ b/pkg/front_end/test/compile_platform_coverage.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import '../tool/_fasta/entry_points.dart' show compilePlatformEntryPoint; +import '../tool/entry_points.dart' show compilePlatformEntryPoint; import 'coverage_helper.dart'; Future main(List arguments) async { diff --git a/pkg/front_end/test/generated_files_up_to_date_git_test.dart b/pkg/front_end/test/generated_files_up_to_date_git_test.dart index 95cb27508b2..61bd5fc04d3 100644 --- a/pkg/front_end/test/generated_files_up_to_date_git_test.dart +++ b/pkg/front_end/test/generated_files_up_to_date_git_test.dart @@ -4,10 +4,10 @@ import "dart:io" show File, exitCode; -import "../tool/_fasta/generate_experimental_flags.dart" +import "../tool/generate_experimental_flags.dart" as generateExperimentalFlags; -import "../tool/_fasta/generate_messages.dart" as generateMessages; -import "../tool/_fasta/parser_ast_helper_creator.dart" +import "../tool/generate_messages.dart" as generateMessages; +import "../tool/parser_ast_helper_creator.dart" as generateParserAstHelper; import '../tool/ast_model.dart'; import '../tool/generate_ast_coverage.dart' as generateAstCoverage; @@ -50,7 +50,7 @@ void directParserAstHelper() { Uri generatedFile = generateParserAstHelper.computeAstHelperUri(repoDir); String generated = generateParserAstHelper.generateAstHelper(repoDir); check(generated, generatedFile, - "dart pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart"); + "dart pkg/front_end/tool/parser_ast_helper_creator.dart"); } Future astEquivalence(AstModel astModel) async { diff --git a/pkg/front_end/test/kernel_binary_bench.dart b/pkg/front_end/test/kernel_binary_bench.dart index 28d6d39b485..5671688edca 100644 --- a/pkg/front_end/test/kernel_binary_bench.dart +++ b/pkg/front_end/test/kernel_binary_bench.dart @@ -14,7 +14,7 @@ import 'package:kernel/binary/ast_from_binary.dart'; import 'package:kernel/binary/ast_to_binary.dart'; import 'package:kernel/src/printer.dart'; -import '../tool/_fasta/compile.dart' as compile; +import '../tool/compile.dart' as compile; final String usage = ''' Usage: kernel_binary_bench.dart [--golem|--raw] {--metadata|--onlyCold} diff --git a/pkg/front_end/test/messages_suite.dart b/pkg/front_end/test/messages_suite.dart index 574c7b39c72..a5ecd20b62c 100644 --- a/pkg/front_end/test/messages_suite.dart +++ b/pkg/front_end/test/messages_suite.dart @@ -34,7 +34,7 @@ import "package:testing/testing.dart" import "package:vm/modular/target/vm.dart" show VmTarget; import "package:yaml/yaml.dart" show YamlList, YamlMap, YamlNode, loadYamlNode; -import "../tool/_fasta/entry_points.dart" show BatchCompiler; +import "../tool/entry_points.dart" show BatchCompiler; import 'spell_checking_utils.dart' as spell; import 'utils/suite_utils.dart' show internalMain; diff --git a/pkg/front_end/test/types/README.md b/pkg/front_end/test/types/README.md index c506b8b38be..360ef9e7d40 100644 --- a/pkg/front_end/test/types/README.md +++ b/pkg/front_end/test/types/README.md @@ -21,7 +21,7 @@ To collect new data for a benchmark, follow these steps: 3. Compile the program using Fasta, for example: - ./sdk/bin/dart pkg/front_end/tool/_fasta/compile.dart pkg/compiler/lib/src/dart2js.dart + ./sdk/bin/dart pkg/front_end/tool/compile.dart pkg/compiler/lib/src/dart2js.dart 4. This produces a file named `type_checks.json` in the current directory. diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json index 7e2c247202c..d3c04ce99ce 100644 --- a/pkg/front_end/testing.json +++ b/pkg/front_end/testing.json @@ -362,7 +362,7 @@ "testcases/rasta/switch_execution_case_t02\\.dart$", "testcases/set_literals/disambiguation_rule\\.dart$", "testcases/set_literals/disambiguation_rule2\\.dart$", - "tool/_fasta/abcompile\\.dart$" + "tool/abcompile\\.dart$" ] }, { diff --git a/pkg/front_end/tool/_fasta/abcompile.dart b/pkg/front_end/tool/abcompile.dart similarity index 99% rename from pkg/front_end/tool/_fasta/abcompile.dart rename to pkg/front_end/tool/abcompile.dart index 58c8673b010..e5d05a052ab 100644 --- a/pkg/front_end/tool/_fasta/abcompile.dart +++ b/pkg/front_end/tool/abcompile.dart @@ -32,7 +32,7 @@ Future main(List args) async { Uri bRoot = new Uri.directory(bRootPath!); // Sanity check - String relPath = 'pkg/front_end/tool/_fasta/compile.dart'; + String relPath = 'pkg/front_end/tool/compile.dart'; Uri aCompile = aRoot.resolve(relPath); if (!new File(aCompile.toFilePath()).existsSync()) { print('Failed to find $aCompile'); diff --git a/pkg/front_end/tool/_fasta/additional_targets.dart b/pkg/front_end/tool/additional_targets.dart similarity index 100% rename from pkg/front_end/tool/_fasta/additional_targets.dart rename to pkg/front_end/tool/additional_targets.dart diff --git a/pkg/front_end/tool/_fasta/additional_targets_test.dart b/pkg/front_end/tool/additional_targets_test.dart similarity index 100% rename from pkg/front_end/tool/_fasta/additional_targets_test.dart rename to pkg/front_end/tool/additional_targets_test.dart diff --git a/pkg/front_end/tool/_fasta/batch.dart b/pkg/front_end/tool/batch.dart similarity index 100% rename from pkg/front_end/tool/_fasta/batch.dart rename to pkg/front_end/tool/batch.dart diff --git a/pkg/front_end/tool/_fasta/bench_maker.dart b/pkg/front_end/tool/bench_maker.dart similarity index 100% rename from pkg/front_end/tool/_fasta/bench_maker.dart rename to pkg/front_end/tool/bench_maker.dart diff --git a/pkg/front_end/tool/_fasta/benchmark_visualiser.html b/pkg/front_end/tool/benchmark_visualiser.html similarity index 100% rename from pkg/front_end/tool/_fasta/benchmark_visualiser.html rename to pkg/front_end/tool/benchmark_visualiser.html diff --git a/pkg/front_end/tool/benchmarker.dart b/pkg/front_end/tool/benchmarker.dart index 01af037c8a6..770aea3c43c 100644 --- a/pkg/front_end/tool/benchmarker.dart +++ b/pkg/front_end/tool/benchmarker.dart @@ -100,12 +100,12 @@ void _help() { print(""); print(r"out/ReleaseX64/dart-sdk/bin/dart \"); print(r" compile aot-snapshot \"); - print(r" pkg/front_end/tool/_fasta/compile.dart"); + print(r" pkg/front_end/tool/compile.dart"); print(""); print("then moving with e.g."); print(""); - print(r"mv pkg/front_end/tool/_fasta/compile.aot \"); - print(r" pkg/front_end/tool/_fasta/compile.aot.1"); + print(r"mv pkg/front_end/tool/compile.aot \"); + print(r" pkg/front_end/tool/compile.aot.1"); print(""); print("Then applying your code-change and compiling again,"); print("this time moving to somewhere else (e.g. .2)"); @@ -114,9 +114,9 @@ void _help() { print(""); print(r"out/ReleaseX64/dart pkg/front_end/tool/benchmarker.dart \"); print(r" --iterations=3 \"); - print(r" --snapshot=pkg/front_end/tool/_fasta/compile.aot.1 \"); - print(r" --snapshot=pkg/front_end/tool/_fasta/compile.aot.2 \"); - print(r" --arguments=pkg/front_end/tool/_fasta/compile.dart"); + print(r" --snapshot=pkg/front_end/tool/compile.aot.1 \"); + print(r" --snapshot=pkg/front_end/tool/compile.aot.2 \"); + print(r" --arguments=pkg/front_end/tool/compile.dart"); print(""); print("This will run the 2 snapshots 3 times each, each time asking it"); print("to compile compile.dart, then do statistics on the data returned"); diff --git a/pkg/front_end/tool/_fasta/command_line.dart b/pkg/front_end/tool/command_line.dart similarity index 100% rename from pkg/front_end/tool/_fasta/command_line.dart rename to pkg/front_end/tool/command_line.dart diff --git a/pkg/front_end/tool/compare_revisions_tool.dart b/pkg/front_end/tool/compare_revisions_tool.dart index c0b44486d04..313057db5d7 100644 --- a/pkg/front_end/tool/compare_revisions_tool.dart +++ b/pkg/front_end/tool/compare_revisions_tool.dart @@ -6,7 +6,7 @@ import "dart:io"; import "benchmarker.dart" as benchmarker; -const String compileDartRelativePath = "pkg/front_end/tool/_fasta/compile.dart"; +const String compileDartRelativePath = "pkg/front_end/tool/compile.dart"; const int iterations = 3; @@ -94,7 +94,7 @@ void _help() { print(""); print(r"out/ReleaseX64/dart-sdk/bin/dart \"); print(r" pkg/front_end/tool/compare_revisions_tool.dart \"); - print(r" --target=pkg/front_end/tool/_fasta/compile.dart \"); + print(r" --target=pkg/front_end/tool/compile.dart \"); print(r" --changingWorkingDir=/tmp/tmp-playing-with-git/sdk/ \"); print(r" --sdkPath=67e9580b042/dart-sdk/ \"); print(r" --snapshotsPath=67e9580b042 \"); diff --git a/pkg/front_end/tool/_fasta/compile.dart b/pkg/front_end/tool/compile.dart similarity index 100% rename from pkg/front_end/tool/_fasta/compile.dart rename to pkg/front_end/tool/compile.dart diff --git a/pkg/front_end/tool/_fasta/compile_platform.dart b/pkg/front_end/tool/compile_platform.dart similarity index 100% rename from pkg/front_end/tool/_fasta/compile_platform.dart rename to pkg/front_end/tool/compile_platform.dart diff --git a/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart b/pkg/front_end/tool/compile_platform_legacy_test.dart similarity index 97% rename from pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart rename to pkg/front_end/tool/compile_platform_legacy_test.dart index 58eea71a2f9..b536d4180e7 100644 --- a/pkg/front_end/tool/_fasta/compile_platform_legacy_test.dart +++ b/pkg/front_end/tool/compile_platform_legacy_test.dart @@ -11,7 +11,7 @@ void main(List arguments) { Uri dartVm = Uri.base.resolveUri(new Uri.file(Platform.resolvedExecutable)); Uri librariesJson = Uri.base.resolve("sdk/lib/libraries.json"); Uri compilePlatform = - Uri.base.resolve("pkg/front_end/tool/_fasta/compile_platform.dart"); + Uri.base.resolve("pkg/front_end/tool/compile_platform.dart"); asyncTest(() async { await withTemporaryDirectory("compile_platform_test_", (Uri tmp) async { Uri platformDill = tmp.resolve("vm_platform.dill"); diff --git a/pkg/front_end/tool/_fasta/compile_platform_test.dart b/pkg/front_end/tool/compile_platform_test.dart similarity index 97% rename from pkg/front_end/tool/_fasta/compile_platform_test.dart rename to pkg/front_end/tool/compile_platform_test.dart index 58eea71a2f9..b536d4180e7 100644 --- a/pkg/front_end/tool/_fasta/compile_platform_test.dart +++ b/pkg/front_end/tool/compile_platform_test.dart @@ -11,7 +11,7 @@ void main(List arguments) { Uri dartVm = Uri.base.resolveUri(new Uri.file(Platform.resolvedExecutable)); Uri librariesJson = Uri.base.resolve("sdk/lib/libraries.json"); Uri compilePlatform = - Uri.base.resolve("pkg/front_end/tool/_fasta/compile_platform.dart"); + Uri.base.resolve("pkg/front_end/tool/compile_platform.dart"); asyncTest(() async { await withTemporaryDirectory("compile_platform_test_", (Uri tmp) async { Uri platformDill = tmp.resolve("vm_platform.dill"); diff --git a/pkg/front_end/tool/_fasta/deps.dart b/pkg/front_end/tool/deps.dart similarity index 100% rename from pkg/front_end/tool/_fasta/deps.dart rename to pkg/front_end/tool/deps.dart diff --git a/pkg/front_end/tool/_fasta/entry_points.dart b/pkg/front_end/tool/entry_points.dart similarity index 99% rename from pkg/front_end/tool/_fasta/entry_points.dart rename to pkg/front_end/tool/entry_points.dart index 3a896ec4994..1d55642e43f 100644 --- a/pkg/front_end/tool/_fasta/entry_points.dart +++ b/pkg/front_end/tool/entry_points.dart @@ -34,7 +34,7 @@ import 'package:kernel/src/types.dart' show Types; import 'package:kernel/target/targets.dart' show Target, TargetFlags, getTarget; import 'package:kernel/verifier.dart'; -import '../../test/coverage_helper.dart'; +import '../test/coverage_helper.dart'; import 'additional_targets.dart' show installAdditionalTargets; import 'bench_maker.dart' show BenchMaker; import 'command_line.dart' show runProtectedFromAbort, withGlobalOptions; diff --git a/pkg/front_end/tool/fasta b/pkg/front_end/tool/fasta index 48d4b7e9113..bd53043a125 100755 --- a/pkg/front_end/tool/fasta +++ b/pkg/front_end/tool/fasta @@ -12,7 +12,7 @@ REPO_DIR="$(cd ${BASH_SOURCE%/*} && git rev-parse --show-toplevel)" DART_VM=${DART_VM-"${REPO_DIR}/sdk/bin/dart"} -TOOL_DIR="${REPO_DIR}/pkg/front_end/tool/_fasta" +TOOL_DIR="${REPO_DIR}/pkg/front_end/tool" KERNEL_BIN="${REPO_DIR}/pkg/kernel/bin" diff --git a/pkg/front_end/tool/fasta.dart b/pkg/front_end/tool/fasta.dart index 18ba1b551e8..be893e3f4a2 100644 --- a/pkg/front_end/tool/fasta.dart +++ b/pkg/front_end/tool/fasta.dart @@ -8,20 +8,20 @@ import 'package:kernel/src/tool/dump.dart' as dump; import "package:testing/src/run_tests.dart" as run_tests; import '../test/utils/io_utils.dart' show computeRepoDir; -import '_fasta/abcompile.dart' as abcompile; -import '_fasta/compile.dart' as compile; -import '_fasta/compile_platform.dart' as compile_platform; -import '_fasta/generate_experimental_flags.dart' as generate_experimental_flags; -import '_fasta/generate_messages.dart' as generate_messages; -import '_fasta/log_analyzer.dart' as log_analyzer; -import '_fasta/log_collector.dart' as log_collector; -import '_fasta/outline.dart' as outline; -import '_fasta/parser.dart' as parser; -import '_fasta/scanner.dart' as scanner; +import 'abcompile.dart' as abcompile; +import 'compile.dart' as compile; +import 'compile_platform.dart' as compile_platform; +import 'generate_experimental_flags.dart' as generate_experimental_flags; +import 'generate_messages.dart' as generate_messages; +import 'log_analyzer.dart' as log_analyzer; +import 'log_collector.dart' as log_collector; +import 'outline.dart' as outline; +import 'parser.dart' as parser; +import 'scanner.dart' as scanner; final String repoDir = computeRepoDir(); -final String toolDir = '$repoDir/pkg/front_end/tool/_fasta'; +final String toolDir = '$repoDir/pkg/front_end/tool'; final String kernelBin = '$repoDir/pkg/kernel/bin'; diff --git a/pkg/front_end/tool/flame/instrumenter.dart b/pkg/front_end/tool/flame/instrumenter.dart index 8bcb30220b5..2d534ff5326 100644 --- a/pkg/front_end/tool/flame/instrumenter.dart +++ b/pkg/front_end/tool/flame/instrumenter.dart @@ -13,9 +13,9 @@ import 'package:front_end/src/base/processed_options.dart'; import 'package:kernel/binary/ast_from_binary.dart'; import 'package:kernel/kernel.dart'; -import '../_fasta/additional_targets.dart'; -import '../_fasta/command_line.dart'; -import '../_fasta/compile.dart' as fasta_compile; +import '../additional_targets.dart'; +import '../command_line.dart'; +import '../compile.dart' as fasta_compile; /// Instrumenter that can produce flame graphs, count invocations, /// perform time tracking etc. @@ -23,12 +23,12 @@ import '../_fasta/compile.dart' as fasta_compile; /// ### Example of using this to produce data for a flame graph /// /// ``` -/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/_fasta/compile.dart -/// out/ReleaseX64/dart pkg/front_end/tool/_fasta/compile.dart.dill.instrumented.dill --omit-platform pkg/front_end/tool/_fasta/compile.dart -/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/_fasta/compile.dart --candidates=cfe_compile_trace_candidates.txt -/// out/ReleaseX64/dart pkg/front_end/tool/_fasta/compile.dart.dill.instrumented.dill --omit-platform pkg/front_end/tool/_fasta/compile.dart -/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/_fasta/compile.dart --candidates=cfe_compile_trace_candidates_subsequent.txt -/// out/ReleaseX64/dart pkg/front_end/tool/_fasta/compile.dart.dill.instrumented.dill --omit-platform pkg/front_end/tool/_fasta/compile.dart +/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/compile.dart +/// out/ReleaseX64/dart pkg/front_end/tool/compile.dart.dill.instrumented.dill --omit-platform pkg/front_end/tool/compile.dart +/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/compile.dart --candidates=cfe_compile_trace_candidates.txt +/// out/ReleaseX64/dart pkg/front_end/tool/compile.dart.dill.instrumented.dill --omit-platform pkg/front_end/tool/compile.dart +/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/compile.dart --candidates=cfe_compile_trace_candidates_subsequent.txt +/// out/ReleaseX64/dart pkg/front_end/tool/compile.dart.dill.instrumented.dill --omit-platform pkg/front_end/tool/compile.dart /// ``` /// /// Where it's instrumented in several passes to automatically find the @@ -42,8 +42,8 @@ import '../_fasta/compile.dart' as fasta_compile; /// ### Example of using this to count method calls /// /// ``` -/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/_fasta/compile.dart --count -/// out/ReleaseX64/dart pkg/front_end/tool/_fasta/compile.dart.dill.instrumented.dill pkg/front_end/tool/_fasta/compile.dart +/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart pkg/front_end/tool/compile.dart --count +/// out/ReleaseX64/dart pkg/front_end/tool/compile.dart.dill.instrumented.dill pkg/front_end/tool/compile.dart /// ``` /// /// It will produce an output like this: @@ -63,8 +63,8 @@ import '../_fasta/compile.dart' as fasta_compile; /// ### Example of using this to get combined time on stack /// /// ``` -/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart -Diterations=10 pkg/front_end/tool/_fasta/compile.dart --single-timer "--candidates-raw=flow_analysis.dart|*" -/// out/ReleaseX64/dart pkg/front_end/tool/_fasta/compile.dart.dill.instrumented.dill pkg/front_end/tool/_fasta/compile.dart +/// out/ReleaseX64/dart pkg/front_end/tool/flame/instrumenter.dart -Diterations=10 pkg/front_end/tool/compile.dart --single-timer "--candidates-raw=flow_analysis.dart|*" +/// out/ReleaseX64/dart pkg/front_end/tool/compile.dart.dill.instrumented.dill pkg/front_end/tool/compile.dart /// ``` /// /// This will give a combined runtime of when any of the instrumented procedures @@ -85,8 +85,8 @@ import '../_fasta/compile.dart' as fasta_compile; /// ### Example of using this to get timings for when on stack: /// /// ``` -/// out/ReleaseX64/dart --enable-asserts pkg/front_end/tool/flame/instrumenter.dart -Diterations=10 pkg/front_end/tool/_fasta/compile.dart --timer "--candidates-raw=flow_analysis.dart|*" -/// out/ReleaseX64/dart pkg/front_end/tool/_fasta/compile.dart.dill.instrumented.dill pkg/front_end/tool/_fasta/compile.dart +/// out/ReleaseX64/dart --enable-asserts pkg/front_end/tool/flame/instrumenter.dart -Diterations=10 pkg/front_end/tool/compile.dart --timer "--candidates-raw=flow_analysis.dart|*" +/// out/ReleaseX64/dart pkg/front_end/tool/compile.dart.dill.instrumented.dill pkg/front_end/tool/compile.dart /// ``` /// /// This will give runtime info for all instrumented procedures, timing when diff --git a/pkg/front_end/tool/_fasta/generate_experimental_flags.dart b/pkg/front_end/tool/generate_experimental_flags.dart similarity index 99% rename from pkg/front_end/tool/_fasta/generate_experimental_flags.dart rename to pkg/front_end/tool/generate_experimental_flags.dart index 4b60b7fb253..28cb92fc939 100644 --- a/pkg/front_end/tool/_fasta/generate_experimental_flags.dart +++ b/pkg/front_end/tool/generate_experimental_flags.dart @@ -10,7 +10,7 @@ import 'package:_fe_analyzer_shared/src/sdk/allowed_experiments.dart'; import 'package:dart_style/dart_style.dart' show DartFormatter; import 'package:yaml/yaml.dart' show YamlMap, loadYaml; -import '../../test/utils/io_utils.dart' show computeRepoDirUri; +import '../test/utils/io_utils.dart' show computeRepoDirUri; void main(List arguments) { final Uri repoDir = computeRepoDirUri(); diff --git a/pkg/front_end/tool/_fasta/generate_messages.dart b/pkg/front_end/tool/generate_messages.dart similarity index 94% rename from pkg/front_end/tool/_fasta/generate_messages.dart rename to pkg/front_end/tool/generate_messages.dart index 39459fc8220..2df40748c8f 100644 --- a/pkg/front_end/tool/_fasta/generate_messages.dart +++ b/pkg/front_end/tool/generate_messages.dart @@ -6,7 +6,7 @@ import 'dart:io' show File; import 'package:dart_style/dart_style.dart' show DartFormatter; -import '../../test/utils/io_utils.dart' show computeRepoDirUri; +import '../test/utils/io_utils.dart' show computeRepoDirUri; import 'generate_messages_lib.dart'; export 'generate_messages_lib.dart'; diff --git a/pkg/front_end/tool/_fasta/generate_messages_failsafe.dart b/pkg/front_end/tool/generate_messages_failsafe.dart similarity index 95% rename from pkg/front_end/tool/_fasta/generate_messages_failsafe.dart rename to pkg/front_end/tool/generate_messages_failsafe.dart index e3f62a972e2..48556ab6514 100644 --- a/pkg/front_end/tool/_fasta/generate_messages_failsafe.dart +++ b/pkg/front_end/tool/generate_messages_failsafe.dart @@ -4,7 +4,7 @@ import 'dart:io'; -import '../../test/utils/io_utils.dart' show computeRepoDirUri; +import '../test/utils/io_utils.dart' show computeRepoDirUri; import 'generate_messages_lib.dart'; void main(List arguments) { diff --git a/pkg/front_end/tool/_fasta/generate_messages_lib.dart b/pkg/front_end/tool/generate_messages_lib.dart similarity index 100% rename from pkg/front_end/tool/_fasta/generate_messages_lib.dart rename to pkg/front_end/tool/generate_messages_lib.dart diff --git a/pkg/front_end/tool/_fasta/log_analyzer.dart b/pkg/front_end/tool/log_analyzer.dart similarity index 100% rename from pkg/front_end/tool/_fasta/log_analyzer.dart rename to pkg/front_end/tool/log_analyzer.dart diff --git a/pkg/front_end/tool/_fasta/log_collector.dart b/pkg/front_end/tool/log_collector.dart similarity index 100% rename from pkg/front_end/tool/_fasta/log_collector.dart rename to pkg/front_end/tool/log_collector.dart diff --git a/pkg/front_end/tool/_fasta/outline.dart b/pkg/front_end/tool/outline.dart similarity index 100% rename from pkg/front_end/tool/_fasta/outline.dart rename to pkg/front_end/tool/outline.dart diff --git a/pkg/front_end/tool/_fasta/parser.dart b/pkg/front_end/tool/parser.dart similarity index 100% rename from pkg/front_end/tool/_fasta/parser.dart rename to pkg/front_end/tool/parser.dart diff --git a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart b/pkg/front_end/tool/parser_ast_helper_creator.dart similarity index 98% rename from pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart rename to pkg/front_end/tool/parser_ast_helper_creator.dart index 6925c04751a..a688331f426 100644 --- a/pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart +++ b/pkg/front_end/tool/parser_ast_helper_creator.dart @@ -10,7 +10,7 @@ import 'package:_fe_analyzer_shared/src/scanner/token.dart'; import 'package:_fe_analyzer_shared/src/scanner/utf8_bytes_scanner.dart'; import 'package:dart_style/dart_style.dart' show DartFormatter; -import '../../test/utils/io_utils.dart' show computeRepoDirUri; +import '../test/utils/io_utils.dart' show computeRepoDirUri; void main(List args) { final Uri repoDir = computeRepoDirUri(); @@ -54,9 +54,9 @@ import '../base/messages.dart'; // ignore_for_file: lines_longer_than_80_chars // THIS FILE IS AUTO GENERATED BY -// 'tool/_fasta/parser_ast_helper_creator.dart' +// 'tool/parser_ast_helper_creator.dart' // Run this command to update it: -// 'dart pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart' +// 'dart pkg/front_end/tool/parser_ast_helper_creator.dart' abstract class ParserAstNode { final String what; diff --git a/pkg/front_end/tool/_fasta/scanner.dart b/pkg/front_end/tool/scanner.dart similarity index 100% rename from pkg/front_end/tool/_fasta/scanner.dart rename to pkg/front_end/tool/scanner.dart diff --git a/pkg/front_end/tool/_fasta/standard_deviation.dart b/pkg/front_end/tool/standard_deviation.dart similarity index 100% rename from pkg/front_end/tool/_fasta/standard_deviation.dart rename to pkg/front_end/tool/standard_deviation.dart diff --git a/pkg/pkg.status b/pkg/pkg.status index 5cf29a48d8f..aa6efecc3b6 100644 --- a/pkg/pkg.status +++ b/pkg/pkg.status @@ -342,10 +342,6 @@ analysis_server/test/socket_server_test: Skip # Pass, Slow [ $mode == debug || $runtime != vm || $system == android ] vm/test/modular_kernel_plus_aot_test: SkipByDesign # This test should only run if binary is run from build dir -[ $mode != release || $runtime != vm ] -front_end/test/fasta/*: Skip -front_end/tool/_fasta/*: Skip - [ $browser || $jscl ] compiler/test/*: Skip # dart2js uses #import('dart:io'); and it is not self-hosted (yet). mmap/*: SkipByDesign # Only meant to run on vm diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 07aaceda9eb..a8776ea232b 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -1485,7 +1485,7 @@ abstract mixin class VMKernelCompilerMixin { class FastaCompilerConfiguration extends CompilerConfiguration { static final _compilerLocation = - Repository.uri.resolve("pkg/front_end/tool/_fasta/compile.dart"); + Repository.uri.resolve("pkg/front_end/tool/compile.dart"); final Uri _platformDill; diff --git a/pkg/test_runner/tool/update_static_error_tests.dart b/pkg/test_runner/tool/update_static_error_tests.dart index 98d201ce46e..8375a121e00 100644 --- a/pkg/test_runner/tool/update_static_error_tests.dart +++ b/pkg/test_runner/tool/update_static_error_tests.dart @@ -294,7 +294,7 @@ Future> runCfe(File file, List options) async { // time generating code, which we don't care about. Import it as a library or // at least run it in batch mode. var result = await Process.run(_dartPath, [ - "pkg/front_end/tool/_fasta/compile.dart", + "pkg/front_end/tool/compile.dart", ...options, "--verify", "-o", diff --git a/runtime/docs/README.md b/runtime/docs/README.md index eb52823e40e..6a6e3613957 100644 --- a/runtime/docs/README.md +++ b/runtime/docs/README.md @@ -235,10 +235,10 @@ At this point enough information is loaded from Kernel binary for runtime to suc > $ dart pkg/vm/bin/dump_kernel.dart hello.dill hello.kernel.txt > ``` > -> When you try using `gen_kernel.dart` you will notice that it requires something called *platform*, a Kernel binary containing AST for all core libraries (`dart:core`, `dart:async`, etc). If you have Dart SDK build configured then you can just use platform file from the `out` directory, e.g. `out/ReleaseX64/vm_platform_strong.dill`. Alternatively you can use [`pkg/front_end/tool/_fasta/compile_platform.dart`][] to generate the platform: +> When you try using `gen_kernel.dart` you will notice that it requires something called *platform*, a Kernel binary containing AST for all core libraries (`dart:core`, `dart:async`, etc). If you have Dart SDK build configured then you can just use platform file from the `out` directory, e.g. `out/ReleaseX64/vm_platform_strong.dill`. Alternatively you can use [`pkg/front_end/tool/compile_platform.dart`][] to generate the platform: > > ```console -> $ dart pkg/front_end/tool/_fasta/compile_platform.dart \ +> $ dart pkg/front_end/tool/compile_platform.dart \ > dart:core \ > sdk/lib/libraries.json \ > vm_outline.dill vm_platform.dill vm_outline.dill @@ -945,7 +945,7 @@ See [Glossary](glossary.md) [`dart::JitCallSpecializer`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/runtime/vm/compiler/jit/jit_call_specializer.h#L16 [`pkg/vm/bin/gen_kernel.dart`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/pkg/vm/bin/gen_kernel.dart [`pkg/vm/bin/dump_kernel.dart`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/pkg/vm/bin/dump_kernel.dart -[`pkg/front_end/tool/_fasta/compile_platform.dart`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/pkg/front_end/tool/_fasta/compile_platform.dart +[`pkg/front_end/tool/compile_platform.dart`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/pkg/front_end/tool/_fasta/compile_platform.dart [`package:kernel/ast.dart`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/pkg/kernel/lib/ast.dart [`package:front_end`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/pkg/front_end/lib [`dart::kernel::KernelLoader::LoadEntireProgram`]: https://github.com/dart-lang/sdk/blob/2ed6ea29003476e2a28fb5f4683a656427eb41ff/runtime/vm/kernel_loader.cc#L236 diff --git a/tests/macro_build/cfe_lt_test.dart b/tests/macro_build/cfe_lt_test.dart index 639f71701e5..47489a7b2e5 100644 --- a/tests/macro_build/cfe_lt_test.dart +++ b/tests/macro_build/cfe_lt_test.dart @@ -8,7 +8,7 @@ void main() { testMacroBuild([ r'$DART pub get', r'$DART ' - r'$DART_SDK/pkg/front_end/tool/_fasta/compile.dart ' + r'$DART_SDK/pkg/front_end/tool/compile.dart ' '--verify ' '--skip-platform-verification -o out.dill ' '--platform ' diff --git a/tools/bots/flutter/compile_flutter.sh b/tools/bots/flutter/compile_flutter.sh index 627a7c0a3d1..045c82cc63c 100755 --- a/tools/bots/flutter/compile_flutter.sh +++ b/tools/bots/flutter/compile_flutter.sh @@ -81,7 +81,7 @@ mkdir flutter_patched_sdk $checkout/tools/sdks/dart-sdk/bin/dart \ --packages=$checkout/.dart_tool/package_config.json \ - $checkout/pkg/front_end/tool/_fasta/compile_platform.dart \ + $checkout/pkg/front_end/tool/compile_platform.dart \ dart:core \ -Ddart.vm.product=false \ -Ddart.isVM=true \ @@ -95,7 +95,7 @@ $checkout/tools/sdks/dart-sdk/bin/dart \ $checkout/tools/sdks/dart-sdk/bin/dart \ --packages=$checkout/.dart_tool/package_config.json \ - $checkout/pkg/front_end/tool/_fasta/compile_platform.dart \ + $checkout/pkg/front_end/tool/compile_platform.dart \ --nnbd-strong \ --target=flutter \ dart:core \ diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 8376e332db5..15fc3c1cd77 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -47,7 +47,7 @@ template("aot_compile_using_prebuilt_sdk") { } aot_compile_using_prebuilt_sdk("compile_platform.exe") { - entry_point = "$_dart_root/pkg/front_end/tool/_fasta/compile_platform.dart" + entry_point = "$_dart_root/pkg/front_end/tool/compile_platform.dart" output = "$root_out_dir/compile_platform.exe" package_config = "$_dart_root/.dart_tool/package_config.json" } diff --git a/utils/compile_platform.gni b/utils/compile_platform.gni index 4bb7f8f636c..9576c45f28e 100644 --- a/utils/compile_platform.gni +++ b/utils/compile_platform.gni @@ -95,7 +95,7 @@ template("compile_platform") { if (defined(invoker.pool)) { pool = invoker.pool } - script = "$_dart_root/pkg/front_end/tool/_fasta/compile_platform.dart" + script = "$_dart_root/pkg/front_end/tool/compile_platform.dart" packages = "$_dart_root/.dart_tool/package_config.json"