From ab4f9351b18ebc35f1f127ab91cfc4186ebed78e Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Mon, 16 Jun 2025 18:33:38 -0700 Subject: [PATCH] Rename vm_platform_strong.dill to vm_platform.dill. The name has always been annoying because it did not add strong typing. And now there aren't variants of the VM platform to distinguish. Leave a copy at the old name to not immediately break illegal uses. TEST=ci Cq-Include-Trybots: luci.dart.try:flutter-analyze-try,flutter-frontend-try,flutter-linux-try Change-Id: Ie76fa7f16940aa1ba8d582eb5197f0ae55dc8938 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429828 Reviewed-by: Johnni Winther Reviewed-by: Nicholas Shahan Commit-Queue: Ryan Macnak --- .../dart/SDKArtifactSizes.dart | 5 +-- build/gn_dart_compile_exe.py | 2 +- build/rbe/rewrapper_dart.py | 5 +-- pkg/dart2bytecode/lib/dart2bytecode.dart | 4 +- .../test/bytecode_generator_test.dart | 2 +- pkg/dart2native/lib/dart2native.dart | 4 +- pkg/dev_compiler/test/hot_reload_suite.dart | 2 +- pkg/dynamic_modules/test/runner/util.dart | 2 +- .../lib/src/base/processed_options.dart | 2 +- .../compute_platform_binaries_location.dart | 6 +-- .../test/compile_platform_coverage.dart | 4 +- pkg/front_end/test/expression_suite.dart | 4 +- .../test/incremental_bulk_compiler_full.dart | 2 +- ...cremental_dart2js_load_from_dill_test.dart | 2 +- .../test/incremental_dartino_suite.dart | 4 +- .../test/incremental_hello_test.dart | 2 +- ...cremental_load_from_invalid_dill_test.dart | 2 +- pkg/front_end/test/incremental_suite.dart | 2 +- pkg/front_end/test/issue_34856_test.dart | 2 +- pkg/front_end/test/messages_suite.dart | 2 +- pkg/front_end/test/metadata_test.dart | 2 +- .../test/src/base/processed_options_test.dart | 6 +-- pkg/front_end/test/test_generator_test.dart | 4 +- pkg/front_end/test/tool_git_test.dart | 2 +- pkg/front_end/tool/command_line.dart | 2 +- .../tool/compare_revisions_tool.dart | 2 +- .../tool/compile_platform_legacy_test.dart | 2 +- pkg/front_end/tool/compile_platform_test.dart | 2 +- pkg/front_end/tool/fuzz/compile_helper.dart | 4 +- pkg/front_end/tool/incremental_perf_test.dart | 2 +- .../lib/src/resident_frontend_server.dart | 2 +- .../test/const_finder_test.dart | 4 +- .../test/frontend_server_test.dart | 2 +- .../test/native_assets_test.dart | 2 +- .../lib/src/compiler_configuration.dart | 8 ++-- pkg/vm/bin/gen_kernel.dart | 2 +- pkg/vm/bin/kernel_service.dart | 4 +- pkg/vm/lib/kernel_front_end.dart | 2 +- pkg/vm/test/common_test_utils.dart | 2 +- pkg/vm/test/incremental_compiler_test.dart | 2 +- pkg/vm/test/kernel_front_end_test.dart | 2 +- pkg/vm/test/modular_kernel_plus_aot_test.dart | 6 +-- pkg/vm/test/obfuscation_test.dart | 4 +- pkg/vm/test/unlinked_ast_to_text_test.dart | 4 +- pkg/vm/tool/precompiler2 | 2 +- runtime/bin/BUILD.gn | 14 +++---- runtime/bin/dfe.cc | 33 ++++++++--------- runtime/bin/main_impl.cc | 2 +- runtime/docs/README.md | 4 +- runtime/docs/contributing_to_dart_ffi.md | 2 +- runtime/docs/dwarf_stack_traces.md | 2 +- runtime/docs/infra/il_tests.md | 2 +- runtime/include/dart_api.h | 2 +- .../dart/isolates/shared_primitives_test.dart | 2 +- .../tests/vm/dart/isolates/shared_test.dart | 2 +- .../vm/dart/sanitizer_compatibility_test.dart | 2 +- .../tests/vm/dart/use_flag_test_helper.dart | 6 +-- runtime/tools/dartfuzz/flag_fuzzer.dart | 2 +- runtime/vm/BUILD.gn | 6 +-- runtime/vm/unit_test.cc | 12 +++--- runtime/vm/unit_test.h | 4 +- sdk/BUILD.gn | 23 +++++++++--- tests/ffi/native_assets/helpers.dart | 2 +- .../check_for_aot_snapshot_jit_test.dart | 2 +- tools/bots/flutter/compile_flutter.sh | 8 ++-- tools/bots/test_matrix.json | 4 +- tools/bots/try_benchmarks.sh | 10 ++--- utils/aot_snapshot.gni | 2 +- utils/application_snapshot.gni | 2 +- utils/compile_platform.gni | 4 +- utils/gen_kernel/BUILD.gn | 2 +- utils/kernel-service/BUILD.gn | 37 +++++++++---------- 72 files changed, 166 insertions(+), 163 deletions(-) diff --git a/benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart b/benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart index 8fe2738e0c4..0222e1165f6 100644 --- a/benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart +++ b/benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart @@ -8,10 +8,7 @@ import 'dart:io'; const executables = ['dart', 'dartaotruntime']; -const libs = [ - 'vm_platform_strong.dill', - 'vm_platform_strong_product.dill', -]; +const libs = ['vm_platform.dill', 'vm_platform_product.dill']; const snapshots = [ 'analysis_server', diff --git a/build/gn_dart_compile_exe.py b/build/gn_dart_compile_exe.py index 656bd4c7e95..41bba66592c 100755 --- a/build/gn_dart_compile_exe.py +++ b/build/gn_dart_compile_exe.py @@ -90,7 +90,7 @@ def main(argv): return 1 platform_dill = os.path.join(prebuilt_sdk, "lib", "_internal", - "vm_platform_strong.dill") + "vm_platform.dill") if not os.path.isfile(platform_dill): print("Binary not found: " + platform_dill) return 1 diff --git a/build/rbe/rewrapper_dart.py b/build/rbe/rewrapper_dart.py index 0cd4217b572..0c22d6c741f 100644 --- a/build/rbe/rewrapper_dart.py +++ b/build/rbe/rewrapper_dart.py @@ -360,8 +360,7 @@ trace to find the place to insert the appropriate support. self.extra_paths.add(self.rebase(arg)) self.extra_paths.add( self.rebase( - os.path.join(self.dart_subdir, - 'vm_platform_strong.dill'))) + os.path.join(self.dart_subdir, 'vm_platform.dill'))) return self.parse_kernel_service_snapshot() else: self.unsupported('dart', arg) @@ -509,7 +508,7 @@ trace to find the place to insert the appropriate support. if sdk.endswith('libraries.json'): sdk = os.path.dirname(sdk) self.extra_paths.add(self.rebase(sdk)) - elif len(compile_platform_args) == 2: # vm_outline_strong dill + elif len(compile_platform_args) == 2: # vm_outline dill arg = self.rebase(arg) elif len(compile_platform_args) == 3: # platform dill arg = self.rebase(arg) diff --git a/pkg/dart2bytecode/lib/dart2bytecode.dart b/pkg/dart2bytecode/lib/dart2bytecode.dart index 7db955bc318..a017336a8f3 100644 --- a/pkg/dart2bytecode/lib/dart2bytecode.dart +++ b/pkg/dart2bytecode/lib/dart2bytecode.dart @@ -37,7 +37,7 @@ import 'options.dart' show BytecodeOptions; final ArgParser _argParser = ArgParser(allowTrailingOptions: true) ..addOption('platform', - help: 'Path to vm_platform_strong.dill file', defaultsTo: null) + help: 'Path to vm_platform.dill file', defaultsTo: null) ..addOption('packages', help: 'Path to .dart_tool/package_config.json file', defaultsTo: null) ..addOption('output', @@ -89,7 +89,7 @@ final ArgParser _argParser = ArgParser(allowTrailingOptions: true) defaultsTo: Verbosity.defaultValue); final String _usage = ''' -Usage: dart2bytecode --platform vm_platform_strong.dill [--import-dill host_app.dill] [--validate dynamic_interface.yaml] [options] input.dart +Usage: dart2bytecode --platform vm_platform.dill [--import-dill host_app.dill] [--validate dynamic_interface.yaml] [options] input.dart Compiles Dart sources to Dart bytecode. Options: diff --git a/pkg/dart2bytecode/test/bytecode_generator_test.dart b/pkg/dart2bytecode/test/bytecode_generator_test.dart index c8b450077c1..57015b67341 100644 --- a/pkg/dart2bytecode/test/bytecode_generator_test.dart +++ b/pkg/dart2bytecode/test/bytecode_generator_test.dart @@ -60,7 +60,7 @@ runTestCase(Uri source) async { Future compileTestCaseToKernelProgram(Uri sourceUri, {required Target target}) async { final platformKernel = - computePlatformBinariesLocation().resolve('vm_platform_strong.dill'); + computePlatformBinariesLocation().resolve('vm_platform.dill'); final options = CompilerOptions() ..target = target ..additionalDills = [platformKernel] diff --git a/pkg/dart2native/lib/dart2native.dart b/pkg/dart2native/lib/dart2native.dart index bdae191b604..a9b9a4ab063 100644 --- a/pkg/dart2native/lib/dart2native.dart +++ b/pkg/dart2native/lib/dart2native.dart @@ -29,13 +29,13 @@ final platformDill = path.join( binDir.parent.path, 'lib', '_internal', - 'vm_platform_strong.dill', + 'vm_platform.dill', ); final productPlatformDill = path.join( binDir.parent.path, 'lib', '_internal', - 'vm_platform_strong_product.dill', + 'vm_platform_product.dill', ); // Maximum page size across all supported architectures (arm64 macOS has 16K diff --git a/pkg/dev_compiler/test/hot_reload_suite.dart b/pkg/dev_compiler/test/hot_reload_suite.dart index 51679081305..b2af4af254f 100644 --- a/pkg/dev_compiler/test/hot_reload_suite.dart +++ b/pkg/dev_compiler/test/hot_reload_suite.dart @@ -1793,7 +1793,7 @@ class D8SuiteRunner extends DdcFeServerSuiteRunner with D8TestRunner { class VMSuiteRunner extends HotReloadFeServerSuiteRunner { final String vmPlatformDillFromSdkRoot = fe_shared.relativizeUri( sdkRoot, - buildRootUri.resolve('vm_platform_strong.dill'), + buildRootUri.resolve('vm_platform.dill'), fe_shared.isWindows, ); late Uri outputDirectoryUri; diff --git a/pkg/dynamic_modules/test/runner/util.dart b/pkg/dynamic_modules/test/runner/util.dart index bd339eecdbd..cfe7384eecf 100644 --- a/pkg/dynamic_modules/test/runner/util.dart +++ b/pkg/dynamic_modules/test/runner/util.dart @@ -99,7 +99,7 @@ Uri dart2bytecodeSnapshot = buildRootUri.resolve( Uri aotRuntimeBin = buildRootUri.resolve( useProduct ? 'dartaotruntime_product' : 'dartaotruntime', ); -Uri vmPlatformDill = buildRootUri.resolve('vm_platform_strong.dill'); +Uri vmPlatformDill = buildRootUri.resolve('vm_platform.dill'); Uri dart2wasmSnapshot = dartBin.resolve('snapshots/dart2wasm_product.snapshot'); Uri dart2wasmPlatformDill = buildRootUri.resolve('dart2wasm_platform.dill'); diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart index c7155c55284..693f437ad89 100644 --- a/pkg/front_end/lib/src/base/processed_options.dart +++ b/pkg/front_end/lib/src/base/processed_options.dart @@ -820,7 +820,7 @@ class ProcessedOptions { // Infer based on the sdkRoot, but only when `compileSdk` is false, // otherwise the default intent was to compile the sdk from sources and // not to load an sdk summary file. - _sdkSummary = root?.resolve("vm_platform_strong.dill"); + _sdkSummary = root?.resolve("vm_platform.dill"); } if (_raw.librariesSpecificationUri != null) { diff --git a/pkg/front_end/lib/src/compute_platform_binaries_location.dart b/pkg/front_end/lib/src/compute_platform_binaries_location.dart index ee8f0904ebb..d26a5d4f7aa 100644 --- a/pkg/front_end/lib/src/compute_platform_binaries_location.dart +++ b/pkg/front_end/lib/src/compute_platform_binaries_location.dart @@ -28,11 +28,9 @@ String? computePlatformDillName(Target target, void Function() onError) { case 'dart2js_server': return 'dart2js_server_platform.dill'; case 'vm': - // TODO(johnniwinther): Stop generating 'vm_platform.dill' and rename - // 'vm_platform_strong.dill' to 'vm_platform.dill'. - return "vm_platform_strong.dill"; + return 'vm_platform.dill'; case 'none': - return "vm_platform_strong.dill"; + return 'vm_platform.dill'; case 'wasm': return 'dart2wasm_outline.dill'; // Coverage-ignore(suite): Not run. diff --git a/pkg/front_end/test/compile_platform_coverage.dart b/pkg/front_end/test/compile_platform_coverage.dart index 2cafa45f579..db65007a412 100644 --- a/pkg/front_end/test/compile_platform_coverage.dart +++ b/pkg/front_end/test/compile_platform_coverage.dart @@ -23,8 +23,8 @@ Future main(List arguments) async { Directory tmp = Directory.systemTemp.createTempSync("compile_platform_coverage"); - String outlinePath = tmp.uri.resolve("vm_outline_strong.dill").toFilePath(); - String platformPath = tmp.uri.resolve("vm_platform_strong.dill").toFilePath(); + String outlinePath = tmp.uri.resolve("vm_outline.dill").toFilePath(); + String platformPath = tmp.uri.resolve("vm_platform.dill").toFilePath(); await compilePlatformEntryPoint([ "dart:core", diff --git a/pkg/front_end/test/expression_suite.dart b/pkg/front_end/test/expression_suite.dart index 7a933f3517e..18b789b8b41 100644 --- a/pkg/front_end/test/expression_suite.dart +++ b/pkg/front_end/test/expression_suite.dart @@ -629,12 +629,12 @@ Future createContext( final Uri entryPoint = base.resolve("nothing.dart"); /// The custom URI used to locate the dill file in the MemoryFileSystem. - final Uri sdkSummary = base.resolve("vm_platform_strong.dill"); + final Uri sdkSummary = base.resolve("vm_platform.dill"); /// The actual location of the dill file. final Uri sdkSummaryFile = computePlatformBinariesLocation(forceBuildDir: true) - .resolve("vm_platform_strong.dill"); + .resolve("vm_platform.dill"); final MemoryFileSystem fs = new MemoryFileSystem(base); diff --git a/pkg/front_end/test/incremental_bulk_compiler_full.dart b/pkg/front_end/test/incremental_bulk_compiler_full.dart index f9f81ef7dcb..2a91be63365 100644 --- a/pkg/front_end/test/incremental_bulk_compiler_full.dart +++ b/pkg/front_end/test/incremental_bulk_compiler_full.dart @@ -43,7 +43,7 @@ CompilerOptions getOptions() { ..onDiagnostic = (DiagnosticMessage message) { // Ignored. }; - options.sdkSummary = sdkRoot.resolve("vm_platform_strong.dill"); + options.sdkSummary = sdkRoot.resolve("vm_platform.dill"); return options; } diff --git a/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart b/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart index da16bfe29f9..8874ae73562 100644 --- a/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart +++ b/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart @@ -48,7 +48,7 @@ Future testDart2jsCompile() async { { // Check that we don't include the source from files from the sdk. final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true); - Uri platformUri = sdkRoot.resolve("vm_platform_strong.dill"); + Uri platformUri = sdkRoot.resolve("vm_platform.dill"); Component cSdk = new Component(); new BinaryBuilder(new File.fromUri(platformUri).readAsBytesSync(), disableLazyReading: false) diff --git a/pkg/front_end/test/incremental_dartino_suite.dart b/pkg/front_end/test/incremental_dartino_suite.dart index 307de2b776d..ebb39523d59 100644 --- a/pkg/front_end/test/incremental_dartino_suite.dart +++ b/pkg/front_end/test/incremental_dartino_suite.dart @@ -194,12 +194,12 @@ class TestCase { Future createContext( Chain suite, Map environment) async { /// The custom URI used to locate the dill file in the MemoryFileSystem. - final Uri sdkSummary = base.resolve("vm_platform_strong.dill"); + final Uri sdkSummary = base.resolve("vm_platform.dill"); /// The actual location of the dill file. final Uri sdkSummaryFile = computePlatformBinariesLocation(forceBuildDir: true) - .resolve("vm_platform_strong.dill"); + .resolve("vm_platform.dill"); final MemoryFileSystem fs = new MemoryFileSystem(base); diff --git a/pkg/front_end/test/incremental_hello_test.dart b/pkg/front_end/test/incremental_hello_test.dart index 2d76d5e94f8..8220014a37d 100644 --- a/pkg/front_end/test/incremental_hello_test.dart +++ b/pkg/front_end/test/incremental_hello_test.dart @@ -37,7 +37,7 @@ Future test({required bool sdkFromSource}) async { } else { optionBuilder.sdkSummary = computePlatformBinariesLocation(forceBuildDir: true) - .resolve("vm_platform_strong.dill"); + .resolve("vm_platform.dill"); } final Uri helloDart = diff --git a/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart b/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart index 4efdb23b130..67d53537da9 100644 --- a/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart +++ b/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart @@ -117,7 +117,7 @@ class Tester { helper2File = base.resolve("helper2.dart"); entryPoint = base.resolve("small.dart"); entryPointImportDartFoo = base.resolve("small_foo.dart"); - platformUri = sdkRoot.resolve("vm_platform_strong.dill"); + platformUri = sdkRoot.resolve("vm_platform.dill"); sdkSummaryData = await new File.fromUri(platformUri).readAsBytes(); errorMessages = []; warningMessages = []; diff --git a/pkg/front_end/test/incremental_suite.dart b/pkg/front_end/test/incremental_suite.dart index bfc601c9bb4..f6740f9f177 100644 --- a/pkg/front_end/test/incremental_suite.dart +++ b/pkg/front_end/test/incremental_suite.dart @@ -2489,7 +2489,7 @@ void checkIsEqual(List a, List b) { CompilerOptions getOptions({Target? target, String? sdkSummary}) { target ??= new VmTarget(new TargetFlags()); - sdkSummary ??= 'vm_platform_strong.dill'; + sdkSummary ??= 'vm_platform.dill'; final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true); CompilerOptions options = new CompilerOptions() ..target = target diff --git a/pkg/front_end/test/issue_34856_test.dart b/pkg/front_end/test/issue_34856_test.dart index f9e94f755e5..e97f3d99d23 100644 --- a/pkg/front_end/test/issue_34856_test.dart +++ b/pkg/front_end/test/issue_34856_test.dart @@ -47,7 +47,7 @@ abstract class UnmodifiableMapView extends MapView }; Future test() async { - final String platformBaseName = "vm_platform_strong.dill"; + final String platformBaseName = "vm_platform.dill"; final Uri base = Uri.parse("org-dartlang-test:///"); final Uri platformDill = base.resolve(platformBaseName); final List platformDillBytes = await new File.fromUri( diff --git a/pkg/front_end/test/messages_suite.dart b/pkg/front_end/test/messages_suite.dart index 0597bb08ed6..4267d2d15db 100644 --- a/pkg/front_end/test/messages_suite.dart +++ b/pkg/front_end/test/messages_suite.dart @@ -739,7 +739,7 @@ class Compile extends Step { await suite.compiler.batchCompile( new CompilerOptions() ..sdkSummary = computePlatformBinariesLocation(forceBuildDir: true) - .resolve("vm_platform_strong.dill") + .resolve("vm_platform.dill") ..explicitExperimentalFlags = example.experimentalFlags ?? {} ..target = new VmTarget(new TargetFlags()) ..fileSystem = new HybridFileSystem(suite.fileSystem) diff --git a/pkg/front_end/test/metadata_test.dart b/pkg/front_end/test/metadata_test.dart index b5fe9f5b7b3..dc84264da83 100644 --- a/pkg/front_end/test/metadata_test.dart +++ b/pkg/front_end/test/metadata_test.dart @@ -163,7 +163,7 @@ void main() async { node.enclosingClass != null; final Uri platform = computePlatformBinariesLocation(forceBuildDir: true) - .resolve("vm_platform_strong.dill"); + .resolve("vm_platform.dill"); final Uint8List platformBinary = await new File(platform.toFilePath()).readAsBytes(); diff --git a/pkg/front_end/test/src/base/processed_options_test.dart b/pkg/front_end/test/src/base/processed_options_test.dart index bad0a0d85d3..c74efbaeb07 100644 --- a/pkg/front_end/test/src/base/processed_options_test.dart +++ b/pkg/front_end/test/src/base/processed_options_test.dart @@ -87,7 +87,7 @@ class ProcessedOptionsTest { ..sdkRoot = Uri.parse('org-dartlang-test:///sdk/dir/') ..compileSdk = false; expect(new ProcessedOptions(options: raw).sdkSummary, - Uri.parse('org-dartlang-test:///sdk/dir/vm_platform_strong.dill')); + Uri.parse('org-dartlang-test:///sdk/dir/vm_platform.dill')); // But it is left null when compile-sdk is true raw = new CompilerOptions() @@ -448,7 +448,7 @@ class ProcessedOptionsTest { .entityForUri(sdkRoot) .writeAsStringSync('\n'); fileSystem - .entityForUri(sdkRoot.resolve('vm_platform_strong.dill')) + .entityForUri(sdkRoot.resolve('vm_platform.dill')) .writeAsStringSync('\n'); fileSystem .entityForUri(Uri.parse('org-dartlang-test:///foo.dart')) @@ -523,7 +523,7 @@ class ProcessedOptionsTest { Future test_validateOptions_inferred_summary_exists() async { var sdkRoot = Uri.parse('org-dartlang-test:///sdk/root/'); var sdkSummary = - Uri.parse('org-dartlang-test:///sdk/root/vm_platform_strong.dill'); + Uri.parse('org-dartlang-test:///sdk/root/vm_platform.dill'); fileSystem.entityForUri(sdkRoot).writeAsStringSync('\n'); fileSystem.entityForUri(sdkSummary).writeAsStringSync('\n'); fileSystem diff --git a/pkg/front_end/test/test_generator_test.dart b/pkg/front_end/test/test_generator_test.dart index 2a5c573a742..341fd6729b4 100644 --- a/pkg/front_end/test/test_generator_test.dart +++ b/pkg/front_end/test/test_generator_test.dart @@ -125,9 +125,9 @@ class TestCompiler { static CompilerAndOptions initialize() { final Uri base = Uri.parse("org-dartlang-test:///"); - final Uri sdkSummary = base.resolve("vm_platform_strong.dill"); + final Uri sdkSummary = base.resolve("vm_platform.dill"); final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true); - Uri platformUri = sdkRoot.resolve("vm_platform_strong.dill"); + Uri platformUri = sdkRoot.resolve("vm_platform.dill"); final List sdkSummaryData = new File.fromUri(platformUri).readAsBytesSync(); MemoryFileSystem fs = new MemoryFileSystem(base); diff --git a/pkg/front_end/test/tool_git_test.dart b/pkg/front_end/test/tool_git_test.dart index afd1d1144a3..03bb31c464d 100644 --- a/pkg/front_end/test/tool_git_test.dart +++ b/pkg/front_end/test/tool_git_test.dart @@ -74,7 +74,7 @@ Error: No Dart file specified. "compile-platform": { "exitCode": 1, "stdout": """ -Usage: compile_platform [options] dart-library-uri libraries.json vm_outline_strong.dill platform.dill outline.dill +Usage: compile_platform [options] dart-library-uri libraries.json vm_outline.dill platform.dill outline.dill Compiles Dart SDK platform to the Dill/Kernel IR format. diff --git a/pkg/front_end/tool/command_line.dart b/pkg/front_end/tool/command_line.dart index 82cbbed4102..244fce0ee41 100644 --- a/pkg/front_end/tool/command_line.dart +++ b/pkg/front_end/tool/command_line.dart @@ -348,7 +348,7 @@ Message computeUsage(String programName, bool verbose) { case "compile_platform": summary = "Compiles Dart SDK platform to the Dill/Kernel IR format."; basicUsage = "Usage: $programName [options]" - " dart-library-uri libraries.json vm_outline_strong.dill" + " dart-library-uri libraries.json vm_outline.dill" " platform.dill outline.dill\n"; } StringBuffer sb = new StringBuffer(basicUsage); diff --git a/pkg/front_end/tool/compare_revisions_tool.dart b/pkg/front_end/tool/compare_revisions_tool.dart index 313057db5d7..731f644328a 100644 --- a/pkg/front_end/tool/compare_revisions_tool.dart +++ b/pkg/front_end/tool/compare_revisions_tool.dart @@ -171,7 +171,7 @@ void _compileRevision(String gitCommit, {Stopwatch? stopwatch}) { "stderr: ${processResult.stderr}\n" "stdout: ${processResult.stdout}"; } - new File("$changingWorkingDir/out/ReleaseX64/vm_platform_strong.dill") + new File("$changingWorkingDir/out/ReleaseX64/vm_platform.dill") .copySync("$snapshotsPath/platform.dill.$gitCommit"); print("Done building the platform for $gitCommit " "after ${stopwatch.elapsed.inSeconds} seconds."); diff --git a/pkg/front_end/tool/compile_platform_legacy_test.dart b/pkg/front_end/tool/compile_platform_legacy_test.dart index b536d4180e7..f300205e21d 100644 --- a/pkg/front_end/tool/compile_platform_legacy_test.dart +++ b/pkg/front_end/tool/compile_platform_legacy_test.dart @@ -15,7 +15,7 @@ void main(List arguments) { asyncTest(() async { await withTemporaryDirectory("compile_platform_test_", (Uri tmp) async { Uri platformDill = tmp.resolve("vm_platform.dill"); - Uri outlineDill = tmp.resolve("vm_outline_strong.dill"); + Uri outlineDill = tmp.resolve("vm_outline.dill"); ProcessResult result = await Process.run(dartVm.toFilePath(), [ compilePlatform.toFilePath(), "-v", diff --git a/pkg/front_end/tool/compile_platform_test.dart b/pkg/front_end/tool/compile_platform_test.dart index b536d4180e7..f300205e21d 100644 --- a/pkg/front_end/tool/compile_platform_test.dart +++ b/pkg/front_end/tool/compile_platform_test.dart @@ -15,7 +15,7 @@ void main(List arguments) { asyncTest(() async { await withTemporaryDirectory("compile_platform_test_", (Uri tmp) async { Uri platformDill = tmp.resolve("vm_platform.dill"); - Uri outlineDill = tmp.resolve("vm_outline_strong.dill"); + Uri outlineDill = tmp.resolve("vm_outline.dill"); ProcessResult result = await Process.run(dartVm.toFilePath(), [ compilePlatform.toFilePath(), "-v", diff --git a/pkg/front_end/tool/fuzz/compile_helper.dart b/pkg/front_end/tool/fuzz/compile_helper.dart index efec0437e68..b6855090bfb 100644 --- a/pkg/front_end/tool/fuzz/compile_helper.dart +++ b/pkg/front_end/tool/fuzz/compile_helper.dart @@ -40,8 +40,8 @@ class Helper { Future setup() async { final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true); base = Uri.parse("org-dartlang-test:///"); - sdkSummary = base.resolve("vm_platform_strong.dill"); - Uri platformUri = sdkRoot.resolve("vm_platform_strong.dill"); + sdkSummary = base.resolve("vm_platform.dill"); + Uri platformUri = sdkRoot.resolve("vm_platform.dill"); sdkSummaryData = await new File.fromUri(platformUri).readAsBytes(); } diff --git a/pkg/front_end/tool/incremental_perf_test.dart b/pkg/front_end/tool/incremental_perf_test.dart index 63f102b58c5..b4fde33cc75 100644 --- a/pkg/front_end/tool/incremental_perf_test.dart +++ b/pkg/front_end/tool/incremental_perf_test.dart @@ -14,7 +14,7 @@ import 'incremental_perf.dart' as m show main; Future main() async { var sdkOutline = computePlatformBinariesLocation(forceBuildDir: true).resolve( // TODO(sigmund): switch to `vm_outline.dill` (issue #29881). - "vm_platform_strong.dill"); + "vm_platform.dill"); final ikgBenchmarks = Platform.script.resolve('../benchmarks/ikg/'); final helloEntry = ikgBenchmarks.resolve('hello.dart'); diff --git a/pkg/frontend_server/lib/src/resident_frontend_server.dart b/pkg/frontend_server/lib/src/resident_frontend_server.dart index c46629bc465..e750173a34f 100644 --- a/pkg/frontend_server/lib/src/resident_frontend_server.dart +++ b/pkg/frontend_server/lib/src/resident_frontend_server.dart @@ -351,7 +351,7 @@ class ResidentFrontendServer { static final Uri _sdkBinariesUri = computePlatformBinariesLocation(); static final Uri _sdkUri = _sdkBinariesUri.resolve('../../'); static final Uri _platformKernelUri = - _sdkBinariesUri.resolve('vm_platform_strong.dill'); + _sdkBinariesUri.resolve('vm_platform.dill'); static final Map compilers = {}; /// Returns a [ResidentCompiler] that has been configured with diff --git a/pkg/frontend_server/test/const_finder_test.dart b/pkg/frontend_server/test/const_finder_test.dart index 24c87f21ea4..072bc5a7959 100644 --- a/pkg/frontend_server/test/const_finder_test.dart +++ b/pkg/frontend_server/test/const_finder_test.dart @@ -540,7 +540,7 @@ class _Test { checkProcessResult(Process.runSync(dart, [ frontendServer, '--sdk-root=$sdkRoot', - '--platform=vm_platform_strong.dill', + '--platform=vm_platform.dill', '--target=vm', '--aot', '--tfa', @@ -581,4 +581,4 @@ class Dart2JSDeepCollectionEquality extends DeepCollectionEquality { } return super.equals(e1, e2); } -} \ No newline at end of file +} diff --git a/pkg/frontend_server/test/frontend_server_test.dart b/pkg/frontend_server/test/frontend_server_test.dart index 3a990a175a5..e820859bdb0 100644 --- a/pkg/frontend_server/test/frontend_server_test.dart +++ b/pkg/frontend_server/test/frontend_server_test.dart @@ -562,7 +562,7 @@ Future main() async { group('full compiler tests', () { final Uri platformKernel = - computePlatformBinariesLocation().resolve('vm_platform_strong.dill'); + computePlatformBinariesLocation().resolve('vm_platform.dill'); final Uri ddcPlatformKernel = computePlatformBinariesLocation().resolve('ddc_outline.dill'); final Uri sdkRoot = computePlatformBinariesLocation(); diff --git a/pkg/frontend_server/test/native_assets_test.dart b/pkg/frontend_server/test/native_assets_test.dart index e3d9e48a387..a112cdec7cc 100644 --- a/pkg/frontend_server/test/native_assets_test.dart +++ b/pkg/frontend_server/test/native_assets_test.dart @@ -16,7 +16,7 @@ import 'frontend_server_test.dart'; void main() async { group('full compiler tests', () { final Uri platformKernel = - computePlatformBinariesLocation().resolve('vm_platform_strong.dill'); + computePlatformBinariesLocation().resolve('vm_platform.dill'); final Uri sdkRoot = computePlatformBinariesLocation(); late Directory tempDir; diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 24e0bb30c7d..c9d83564ed4 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -1434,7 +1434,7 @@ abstract mixin class VMKernelCompilerMixin { kernelBinariesFolder += '/dart-sdk/lib/_internal'; } - var vmPlatform = '$kernelBinariesFolder/vm_platform_strong.dill'; + var vmPlatform = '$kernelBinariesFolder/vm_platform.dill'; var dillFile = tempKernelFile(tempDir); @@ -1483,7 +1483,7 @@ class FastaCompilerConfiguration extends CompilerConfiguration { dillDir = buildDirectory.resolve("dart-sdk/lib/_internal/"); } - var platformDill = dillDir.resolve("vm_platform_strong.dill"); + var platformDill = dillDir.resolve("vm_platform.dill"); var vmExecutable = buildDirectory .resolve(configuration.useSdk ? "dart-sdk/bin/dart" : "dart"); @@ -1588,8 +1588,8 @@ class BytecodeCompilerConfiguration extends CompilerConfiguration { : '${_configuration.buildDirectory}/gen/dart2bytecode.dart.snapshot'; String platformKernelFile() => _useSdk - ? '${_configuration.buildDirectory}/dart-sdk/lib/_internal/vm_platform_strong.dill' - : '${_configuration.buildDirectory}/vm_platform_strong.dill'; + ? '${_configuration.buildDirectory}/dart-sdk/lib/_internal/vm_platform.dill' + : '${_configuration.buildDirectory}/vm_platform.dill'; String tempBytecodeFile(String tempDir) => Path('$tempDir/out.bytecode').toNativePath(); diff --git a/pkg/vm/bin/gen_kernel.dart b/pkg/vm/bin/gen_kernel.dart index 6b6a180686a..3ac87e94713 100644 --- a/pkg/vm/bin/gen_kernel.dart +++ b/pkg/vm/bin/gen_kernel.dart @@ -20,7 +20,7 @@ import 'package:vm/kernel_front_end.dart' final ArgParser _argParser = createCompilerArgParser(); final String _usage = ''' -Usage: dart pkg/vm/bin/gen_kernel.dart --platform vm_platform_strong.dill [options] input.dart +Usage: dart pkg/vm/bin/gen_kernel.dart --platform vm_platform.dill [options] input.dart Compiles Dart sources to a kernel binary file for Dart VM. Options: diff --git a/pkg/vm/bin/kernel_service.dart b/pkg/vm/bin/kernel_service.dart index aab290ecaea..8cb29dc2f54 100644 --- a/pkg/vm/bin/kernel_service.dart +++ b/pkg/vm/bin/kernel_service.dart @@ -634,7 +634,7 @@ Future _processExpressionCompilationRequest(request) async { platformKernel = dartPlatformKernel; } else { final Uri platformUri = computePlatformBinariesLocation().resolve( - 'vm_platform_strong.dill', + 'vm_platform.dill', ); final File platformFile = new File.fromUri(platformUri); if (platformFile.existsSync()) { @@ -878,7 +878,7 @@ Future _processLoadRequest(request) async { platformKernel = request[3]; } else { platformKernelPath = computePlatformBinariesLocation().resolve( - 'vm_platform_strong.dill', + 'vm_platform.dill', ); } diff --git a/pkg/vm/lib/kernel_front_end.dart b/pkg/vm/lib/kernel_front_end.dart index d5b003ee803..d5b6fd7b5d5 100644 --- a/pkg/vm/lib/kernel_front_end.dart +++ b/pkg/vm/lib/kernel_front_end.dart @@ -77,7 +77,7 @@ import 'transformations/vm_constant_evaluator.dart' as vm_constant_evaluator; void declareCompilerOptions(ArgParser args) { args.addOption( 'platform', - help: 'Path to vm_platform_strong.dill file', + help: 'Path to vm_platform.dill file', defaultsTo: null, ); args.addOption( diff --git a/pkg/vm/test/common_test_utils.dart b/pkg/vm/test/common_test_utils.dart index 6bfbdd4d0cb..07c58a4615e 100644 --- a/pkg/vm/test/common_test_utils.dart +++ b/pkg/vm/test/common_test_utils.dart @@ -40,7 +40,7 @@ Future compileTestCaseToKernelProgram( final platformFileName = (target is WasmTarget) ? target.platformFile - : 'vm_platform_strong.dill'; + : 'vm_platform.dill'; final platformKernel = computePlatformBinariesLocation().resolve( platformFileName, ); diff --git a/pkg/vm/test/incremental_compiler_test.dart b/pkg/vm/test/incremental_compiler_test.dart index 2f209c44bce..7889969f02e 100644 --- a/pkg/vm/test/incremental_compiler_test.dart +++ b/pkg/vm/test/incremental_compiler_test.dart @@ -30,7 +30,7 @@ import 'common_test_utils.dart'; main() { final platformKernel = computePlatformBinariesLocation().resolve( - 'vm_platform_strong.dill', + 'vm_platform.dill', ); final sdkRoot = computePlatformBinariesLocation(); diff --git a/pkg/vm/test/kernel_front_end_test.dart b/pkg/vm/test/kernel_front_end_test.dart index 4a354c667f0..dde39d25fc1 100644 --- a/pkg/vm/test/kernel_front_end_test.dart +++ b/pkg/vm/test/kernel_front_end_test.dart @@ -15,7 +15,7 @@ final String sdkDir = Platform.script.resolve('../../..').toFilePath(); String platformPath() => computePlatformBinariesLocation() - .resolve('vm_platform_strong.dill') + .resolve('vm_platform.dill') .toFilePath(); const String mainScript = 'pkg/vm/bin/gen_kernel.dart'; diff --git a/pkg/vm/test/modular_kernel_plus_aot_test.dart b/pkg/vm/test/modular_kernel_plus_aot_test.dart index b55e64dac9a..efc26076720 100644 --- a/pkg/vm/test/modular_kernel_plus_aot_test.dart +++ b/pkg/vm/test/modular_kernel_plus_aot_test.dart @@ -15,15 +15,13 @@ import 'package:vm/modular/target/vm.dart'; import 'package:vm/kernel_front_end.dart'; main() async { - Uri sdkSummary = sdkRootFile( - Platform.executable, - ).resolve('vm_platform_strong.dill'); + Uri sdkSummary = sdkRootFile(Platform.executable).resolve('vm_platform.dill'); if (!await File.fromUri(sdkSummary).exists()) { // If we run from the /dart-sdk/bin folder, we need to navigate two // levels up. sdkSummary = sdkRootFile( Platform.executable, - ).resolve('../../vm_platform_strong.dill'); + ).resolve('../../vm_platform.dill'); } // Tests are run in the root directory of the sdk checkout. diff --git a/pkg/vm/test/obfuscation_test.dart b/pkg/vm/test/obfuscation_test.dart index 4f6f041b0f3..0a267756d33 100644 --- a/pkg/vm/test/obfuscation_test.dart +++ b/pkg/vm/test/obfuscation_test.dart @@ -87,11 +87,11 @@ List getSnapshotMap(Directory tmpDir, File compileDartFile) { } final Uri platformDill = computePlatformBinariesLocation().resolve( - 'vm_platform_strong_product.dill', + 'vm_platform_product.dill', ); final File platformDillFile = new File.fromUri(platformDill); if (!platformDillFile.existsSync()) { - throw "Didn't find vm_platform_strong_product at $platformDill"; + throw "Didn't find vm_platform_product at $platformDill"; } final Uri tmpDirUri = tmpDir.uri; diff --git a/pkg/vm/test/unlinked_ast_to_text_test.dart b/pkg/vm/test/unlinked_ast_to_text_test.dart index 36af8a35fb8..d57e4019587 100644 --- a/pkg/vm/test/unlinked_ast_to_text_test.dart +++ b/pkg/vm/test/unlinked_ast_to_text_test.dart @@ -25,12 +25,12 @@ main() async { late final String platformDill; if (executable.endsWith('ReleaseX64/dart')) { platformDill = - Uri.parse(executable).resolve('vm_platform_strong.dill').toFilePath(); + Uri.parse(executable).resolve('vm_platform.dill').toFilePath(); } else if (executable.endsWith('dart-sdk/bin/dart')) { platformDill = Uri.parse( executable, - ).resolve('../lib/_internal/vm_platform_strong.dill').toFilePath(); + ).resolve('../lib/_internal/vm_platform.dill').toFilePath(); } else { print( 'Skipping test due to not being run .../ReleaseX64/dart or .../dart-sdk/bin/dart.', diff --git a/pkg/vm/tool/precompiler2 b/pkg/vm/tool/precompiler2 index 24506cd7b01..2ac85c1f0a1 100755 --- a/pkg/vm/tool/precompiler2 +++ b/pkg/vm/tool/precompiler2 @@ -142,7 +142,7 @@ function gen_kernel() { } # Step 1: Generate Kernel binary from the input Dart source. -gen_kernel --platform "${BUILD_DIR}/vm_platform_strong.dill" \ +gen_kernel --platform "${BUILD_DIR}/vm_platform.dill" \ --aot \ "${GEN_KERNEL_OPTIONS[@]}" \ $PACKAGES \ diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn index 0ab17c45ce5..a1e333d30a0 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn @@ -582,7 +582,7 @@ gen_snapshot_action("generate_snapshot_bin") { isolate_snapshot_instructions = "$target_gen_dir/isolate_snapshot_instructions.bin" - platform_dill = "$root_out_dir/vm_platform_strong_stripped.dill" + platform_dill = "$root_out_dir/vm_platform_stripped.dill" inputs = [ platform_dill ] outputs = [ vm_snapshot_data, @@ -734,11 +734,11 @@ bin_to_linkable("kernel_service_dill_linkable") { executable = false } -bin_to_linkable("platform_strong_dill_linkable") { +bin_to_linkable("platform_dill_linkable") { deps = [ "../vm:vm_platform" ] - input = "$root_out_dir/vm_platform_strong.dill" - symbol = "kPlatformStrongDill" - size_symbol = "kPlatformStrongDillSize" + input = "$root_out_dir/vm_platform.dill" + symbol = "kPlatformDill" + size_symbol = "kPlatformDillSize" executable = false } @@ -776,10 +776,10 @@ source_set("dart_kernel_platform_cc") { ] deps = [ ":kernel_service_dill_linkable", - ":platform_strong_dill_linkable", + ":platform_dill_linkable", ] sources = get_target_outputs(":kernel_service_dill_linkable") + - get_target_outputs(":platform_strong_dill_linkable") + get_target_outputs(":platform_dill_linkable") } source_set("icudtl_cc") { diff --git a/runtime/bin/dfe.cc b/runtime/bin/dfe.cc index 6df231470ba..9d4ce3314e9 100644 --- a/runtime/bin/dfe.cc +++ b/runtime/bin/dfe.cc @@ -19,13 +19,13 @@ extern "C" { #if !defined(EXCLUDE_CFE_AND_KERNEL_PLATFORM) extern const uint8_t kKernelServiceDill[]; extern intptr_t kKernelServiceDillSize; -extern const uint8_t kPlatformStrongDill[]; -extern intptr_t kPlatformStrongDillSize; +extern const uint8_t kPlatformDill[]; +extern intptr_t kPlatformDillSize; #else const uint8_t* kKernelServiceDill = nullptr; intptr_t kKernelServiceDillSize = 0; -const uint8_t* kPlatformStrongDill = nullptr; -intptr_t kPlatformStrongDillSize = 0; +const uint8_t* kPlatformDill = nullptr; +intptr_t kPlatformDillSize = 0; #endif // !defined(EXCLUDE_CFE_AND_KERNEL_PLATFORM) } @@ -47,11 +47,11 @@ const intptr_t kernel_service_dill_size = kKernelServiceDillSize; #endif #if defined(EXCLUDE_CFE_AND_KERNEL_PLATFORM) -const uint8_t* platform_strong_dill = nullptr; -const intptr_t platform_strong_dill_size = 0; +const uint8_t* platform_dill = nullptr; +const intptr_t platform_dill_size = 0; #else -const uint8_t* platform_strong_dill = kPlatformStrongDill; -const intptr_t platform_strong_dill_size = kPlatformStrongDillSize; +const uint8_t* platform_dill = kPlatformDill; +const intptr_t platform_dill_size = kPlatformDillSize; #endif #if !defined(DART_PRECOMPILED_RUNTIME) @@ -80,13 +80,12 @@ DFE::~DFE() { } void DFE::Init() { - if (platform_strong_dill == nullptr) { + if (platform_dill == nullptr) { return; } InitKernelServiceAndPlatformDills(); - Dart_SetDartLibrarySourcesKernel(platform_strong_dill, - platform_strong_dill_size); + Dart_SetDartLibrarySourcesKernel(platform_dill, platform_dill_size); } void DFE::InitKernelServiceAndPlatformDills() { @@ -130,12 +129,12 @@ void DFE::LoadKernelService(const uint8_t** kernel_service_buffer, void DFE::LoadPlatform(const uint8_t** kernel_buffer, intptr_t* kernel_buffer_size) { - *kernel_buffer = platform_strong_dill; - *kernel_buffer_size = platform_strong_dill_size; + *kernel_buffer = platform_dill; + *kernel_buffer_size = platform_dill_size; } bool DFE::CanUseDartFrontend() const { - return (platform_strong_dill != nullptr) && + return (platform_dill != nullptr) && (KernelServiceDillAvailable() || (frontend_filename() != nullptr)); } @@ -190,9 +189,9 @@ Dart_KernelCompilationResult DFE::CompileScript(const char* script_uri, PathSanitizer path_sanitizer(script_uri); const char* sanitized_uri = path_sanitizer.sanitized_uri(); - return Dart_CompileToKernel( - sanitized_uri, platform_strong_dill, platform_strong_dill_size, - incremental, for_snapshot, embed_sources, package_config, verbosity()); + return Dart_CompileToKernel(sanitized_uri, platform_dill, platform_dill_size, + incremental, for_snapshot, embed_sources, + package_config, verbosity()); } void DFE::CompileAndReadScript(const char* script_uri, diff --git a/runtime/bin/main_impl.cc b/runtime/bin/main_impl.cc index 1738fc8a879..819d7de32b9 100644 --- a/runtime/bin/main_impl.cc +++ b/runtime/bin/main_impl.cc @@ -1330,7 +1330,7 @@ void main(int argc, char** argv) { // Note: must read platform only *after* VM flags are parsed because // they might affect how the platform is loaded. #if !defined(DART_PRECOMPILED_RUNTIME) - // Load vm_platform_strong.dill for dart:* source support. + // Load vm_platform.dill for dart:* source support. dfe.Init(); dfe.set_verbosity(Options::verbosity_level()); if (script_name != nullptr) { diff --git a/runtime/docs/README.md b/runtime/docs/README.md index f6bf5d999c6..8df19d5a4f3 100644 --- a/runtime/docs/README.md +++ b/runtime/docs/README.md @@ -226,7 +226,7 @@ At this point enough information is loaded from Kernel binary for runtime to suc > * Compile `hello.dart` to `hello.dill` Kernel binary using CFE > ```console > $ dart pkg/vm/bin/gen_kernel.dart \ -> --platform out/ReleaseX64/vm_platform_strong.dill \ +> --platform out/ReleaseX64/vm_platform.dill \ > -o hello.dill \ > hello.dart > ``` @@ -235,7 +235,7 @@ 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/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.dill`. Alternatively you can use [`pkg/front_end/tool/compile_platform.dart`][] to generate the platform: > > ```console > $ dart pkg/front_end/tool/compile_platform.dart \ diff --git a/runtime/docs/contributing_to_dart_ffi.md b/runtime/docs/contributing_to_dart_ffi.md index 727d44dd961..1cd9d856513 100644 --- a/runtime/docs/contributing_to_dart_ffi.md +++ b/runtime/docs/contributing_to_dart_ffi.md @@ -183,7 +183,7 @@ Running the CFE on a Dart file can be done with the following configuration. "request": "launch", "program": "pkg/vm/bin/gen_kernel.dart", "args": [ - "--platform=${workspaceFolder}/xcodebuild/ReleaseARM64/vm_platform_strong.dill", + "--platform=${workspaceFolder}/xcodebuild/ReleaseARM64/vm_platform.dill", "third_party/pkg/native/pkgs/ffi/test/allocation_test.dart", ], "toolArgs": [], diff --git a/runtime/docs/dwarf_stack_traces.md b/runtime/docs/dwarf_stack_traces.md index f57fa13ba73..904aee41ea3 100644 --- a/runtime/docs/dwarf_stack_traces.md +++ b/runtime/docs/dwarf_stack_traces.md @@ -48,7 +48,7 @@ Below is the result of running the file both without and with ```bash $ python3 tools/build.py -a x64 -m release runtime runtime_precompiled -$ pkg/vm/tool/gen_kernel --platform out/ReleaseX64/vm_platform_strong.dill -o throws.dill throws.dart +$ pkg/vm/tool/gen_kernel --platform out/ReleaseX64/vm_platform.dill -o throws.dill throws.dart $ out/ReleaseX64/gen_snapshot --snapshot_kind=app-aot-elf --elf=snapshot.so throws.dill diff --git a/runtime/docs/infra/il_tests.md b/runtime/docs/infra/il_tests.md index 70aa32130b8..c37e3d84342 100644 --- a/runtime/docs/infra/il_tests.md +++ b/runtime/docs/infra/il_tests.md @@ -20,7 +20,7 @@ $ tools/test.py -c dartkp -m release $path_to_an_il_test ``` Tests require `gen_snapshot`, `dartaotruntime` and -`vm_platform_strong.dill` to be built for the target configuration. +`vm_platform.dill` to be built for the target configuration. Each IL test should contain one or more of the functions marked with a `@pragma('vm:testing:print-flow-graph'[, 'phases filter'])`. diff --git a/runtime/include/dart_api.h b/runtime/include/dart_api.h index c46eac8e7ed..064cdf6ab44 100644 --- a/runtime/include/dart_api.h +++ b/runtime/include/dart_api.h @@ -3820,7 +3820,7 @@ DART_EXPORT Dart_Port Dart_KernelPort(void); * Compiles the given `script_uri` to a kernel file. * * \param platform_kernel A buffer containing the kernel of the platform (e.g. - * `vm_platform_strong.dill`). The VM does not take ownership of this memory. + * `vm_platform.dill`). The VM does not take ownership of this memory. * * \param platform_kernel_size The length of the platform_kernel buffer. * diff --git a/runtime/tests/vm/dart/isolates/shared_primitives_test.dart b/runtime/tests/vm/dart/isolates/shared_primitives_test.dart index 3277d7692b5..a2472e60a44 100644 --- a/runtime/tests/vm/dart/isolates/shared_primitives_test.dart +++ b/runtime/tests/vm/dart/isolates/shared_primitives_test.dart @@ -23,7 +23,7 @@ import '../use_flag_test_helper.dart'; void main(List args) async { if (Platform.isAndroid) { - return; // No vm_platform_strong.dill easily available. + return; // No vm_platform.dill easily available. } if (isSimulator) { return; // No ffi support on simulators diff --git a/runtime/tests/vm/dart/isolates/shared_test.dart b/runtime/tests/vm/dart/isolates/shared_test.dart index 3f75d44712a..a47a111336b 100644 --- a/runtime/tests/vm/dart/isolates/shared_test.dart +++ b/runtime/tests/vm/dart/isolates/shared_test.dart @@ -22,7 +22,7 @@ import '../use_flag_test_helper.dart'; void main(List args) async { if (Platform.isAndroid) { - return; // No vm_platform_strong.dill easily available. + return; // No vm_platform.dill easily available. } asyncStart(); diff --git a/runtime/tests/vm/dart/sanitizer_compatibility_test.dart b/runtime/tests/vm/dart/sanitizer_compatibility_test.dart index eeff88576f2..61a1e30d70b 100644 --- a/runtime/tests/vm/dart/sanitizer_compatibility_test.dart +++ b/runtime/tests/vm/dart/sanitizer_compatibility_test.dart @@ -36,7 +36,7 @@ main() async { "TSAN": "--target_thread_sanitizer", }[sanitizer]!; - var nonePlatform = "$out/$mode$arch/vm_platform_strong.dill"; + var nonePlatform = "$out/$mode$arch/vm_platform.dill"; var noneGenSnapshot = "$out/$mode$arch/gen_snapshot"; var noneJitRuntime = "$out/$mode$arch/dart"; var noneAotRuntime = "$out/$mode$arch/dartaotruntime"; diff --git a/runtime/tests/vm/dart/use_flag_test_helper.dart b/runtime/tests/vm/dart/use_flag_test_helper.dart index fa4f6ba271b..de5d9a80b9f 100644 --- a/runtime/tests/vm/dart/use_flag_test_helper.dart +++ b/runtime/tests/vm/dart/use_flag_test_helper.dart @@ -16,16 +16,16 @@ final sdkDir = path.dirname(path.dirname(buildDir)); late final platformDill = () { final possiblePaths = [ // No cross compilation. - path.join(buildDir, 'vm_platform_strong.dill'), + path.join(buildDir, 'vm_platform.dill'), // ${MODE}SIMARM_X64 for X64->SIMARM cross compilation. - path.join('${buildDir}_X64', 'vm_platform_strong.dill'), + path.join('${buildDir}_X64', 'vm_platform.dill'), ]; for (final path in possiblePaths) { if (File(path).existsSync()) { return path; } } - throw 'Could not find vm_platform_strong.dill for build directory $buildDir'; + throw 'Could not find vm_platform.dill for build directory $buildDir'; }(); final genKernel = path.join( sdkDir, diff --git a/runtime/tools/dartfuzz/flag_fuzzer.dart b/runtime/tools/dartfuzz/flag_fuzzer.dart index 4d72ed5b63a..1348e7a1426 100644 --- a/runtime/tools/dartfuzz/flag_fuzzer.dart +++ b/runtime/tools/dartfuzz/flag_fuzzer.dart @@ -185,7 +185,7 @@ test(List Function(String) createDartCommand, int taskIndex) async { [ "out/ReleaseX64/dart", "pkg/vm/bin/gen_kernel.dart", - "--platform=$buildDir/vm_platform_strong.dill", + "--platform=$buildDir/vm_platform.dill", "--aot", "--output=out/dartfuzz/$taskIndex.dill", dartScript, diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn index a28bd8d7ef9..6dfa4d51d93 100644 --- a/runtime/vm/BUILD.gn +++ b/runtime/vm/BUILD.gn @@ -287,13 +287,13 @@ template("gen_vm_platform") { gen_vm_platform("vm_platform") { add_implicit_vm_platform_dependency = false exclude_source = false - output_postfix = "_strong" + output_postfix = "" } gen_vm_platform("vm_platform_product") { add_implicit_vm_platform_dependency = false exclude_source = false - output_postfix = "_strong_product" + output_postfix = "_product" # In Debug mode we use debug binaries for dart2native. # (see also the "dart_product_config" config) @@ -303,7 +303,7 @@ gen_vm_platform("vm_platform_product") { gen_vm_platform("vm_platform_stripped") { add_implicit_vm_platform_dependency = false exclude_source = true - output_postfix = "_strong_stripped" + output_postfix = "_stripped" } group("kernel_platform_files") { diff --git a/runtime/vm/unit_test.cc b/runtime/vm/unit_test.cc index a6fb14c6666..23ed2b77324 100644 --- a/runtime/vm/unit_test.cc +++ b/runtime/vm/unit_test.cc @@ -28,8 +28,8 @@ using dart::bin::Builtin; using dart::bin::DartUtils; extern "C" { -extern const uint8_t kPlatformStrongDill[]; -extern intptr_t kPlatformStrongDillSize; +extern const uint8_t kPlatformDill[]; +extern intptr_t kPlatformDillSize; } namespace dart { @@ -37,8 +37,8 @@ namespace dart { DECLARE_FLAG(bool, gc_during_reload); DECLARE_FLAG(bool, force_evacuation); -const uint8_t* platform_strong_dill = kPlatformStrongDill; -const intptr_t platform_strong_dill_size = kPlatformStrongDillSize; +const uint8_t* platform_dill = kPlatformDill; +const intptr_t platform_dill_size = kPlatformDillSize; const uint8_t* TesterState::vm_snapshot_data = nullptr; Dart_IsolateGroupCreateCallback TesterState::create_callback = nullptr; @@ -328,8 +328,8 @@ char* TestCase::CompileTestScriptWithDFE(const char* url, const char* multiroot_scheme) { Zone* zone = Thread::Current()->zone(); Dart_KernelCompilationResult result = KernelIsolate::CompileToKernel( - url, platform_strong_dill, platform_strong_dill_size, sourcefiles_count, - sourcefiles, incrementally, /*for_snapshot=*/false, + url, platform_dill, platform_dill_size, sourcefiles_count, sourcefiles, + incrementally, /*for_snapshot=*/false, /*embed_sources=*/true, nullptr, multiroot_filepaths, multiroot_scheme); if (result.status == Dart_KernelCompilationStatus_Ok) { if (KernelIsolate::AcceptCompilation().status != diff --git a/runtime/vm/unit_test.h b/runtime/vm/unit_test.h index 76ab4c6dbce..9e2e948ff0e 100644 --- a/runtime/vm/unit_test.h +++ b/runtime/vm/unit_test.h @@ -247,8 +247,8 @@ extern const uint8_t* core_isolate_snapshot_data; extern const uint8_t* core_isolate_snapshot_instructions; } // namespace bin -extern const uint8_t* platform_strong_dill; -extern const intptr_t platform_strong_dill_size; +extern const uint8_t* platform_dill; +extern const intptr_t platform_dill_size; class TesterState : public AllStatic { public: diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 37cadc80064..a67a7574d5c 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -78,7 +78,7 @@ declare_args() { # ........dart2wasm_js_compatibility_platform.dill (if not on ia32) # ........ddc_outline.dill # ........ddc_platform.dill -# ........vm_platform_strong.dill +# ........vm_platform.dill # ........js_dev_runtime/ # ........js_runtime/ # ........js_shared/ @@ -417,11 +417,11 @@ if (_has_dot_sym) { } } -copy("copy_vm_platform_strong_product") { +copy("copy_vm_platform_product") { visibility = [ ":group_dart2native" ] deps = [ "../runtime/vm:vm_platform_product" ] src_dir = get_label_info("../runtime/vm:vm_platform_product", "root_out_dir") - sources = [ "$src_dir/vm_platform_strong_product.dill" ] + sources = [ "$src_dir/vm_platform_product.dill" ] outputs = [ "$root_out_dir/$dart_sdk_output/lib/_internal/{{source_file_part}}" ] } @@ -439,7 +439,7 @@ group("group_dart2native") { ":copy_dart_aotruntime", ":copy_gen_kernel_snapshot", ":copy_gen_snapshot", - ":copy_vm_platform_strong_product", + ":copy_vm_platform_product", ] } @@ -552,11 +552,23 @@ copy("copy_vm_dill_files") { ":copy_libraries", "../runtime/vm:kernel_platform_files", ] - sources = [ "$root_out_dir/vm_platform_strong.dill" ] + sources = [ "$root_out_dir/vm_platform.dill" ] outputs = [ "$root_out_dir/$dart_sdk_output/lib/_internal/{{source_file_part}}" ] } +# Delete this after external packages are migrated to vm_platform.dill. +copy("copy_vm_strong_dill_files") { + visibility = [ ":create_common_sdk" ] + deps = [ + ":copy_libraries", + "../runtime/vm:kernel_platform_files", + ] + sources = [ "$root_out_dir/vm_platform.dill" ] + outputs = + [ "$root_out_dir/$dart_sdk_output/lib/_internal/vm_platform_strong.dill" ] +} + copy("copy_dart2js_dill_files") { visibility = [ ":create_full_sdk" ] deps = [ @@ -813,6 +825,7 @@ group("create_common_sdk") { ":copy_readme", ":copy_sdk_packages_yaml", ":copy_vm_dill_files", + ":copy_vm_strong_dill_files", ":write_dartdoc_options", ":write_revision_file", ":write_version_file", diff --git a/tests/ffi/native_assets/helpers.dart b/tests/ffi/native_assets/helpers.dart index 68bfc2b3312..40e95e65ea0 100644 --- a/tests/ffi/native_assets/helpers.dart +++ b/tests/ffi/native_assets/helpers.dart @@ -64,7 +64,7 @@ final dartPrecompiledRuntimeUri = buildUriAbsolute.resolve( 'dartaotruntime$standaloneExtensionExe', ); -final platformDillUri = buildUriAbsolute.resolve('vm_platform_strong.dill'); +final platformDillUri = buildUriAbsolute.resolve('vm_platform.dill'); final packageConfigUri = sdkUriAbsolute.resolve( '.dart_tool/package_config.json', diff --git a/tests/standalone/check_for_aot_snapshot_jit_test.dart b/tests/standalone/check_for_aot_snapshot_jit_test.dart index 83ed4d81f8f..a683fee065a 100644 --- a/tests/standalone/check_for_aot_snapshot_jit_test.dart +++ b/tests/standalone/check_for_aot_snapshot_jit_test.dart @@ -12,7 +12,7 @@ final _batchSuffix = Platform.isWindows ? '.bat' : ''; main() { final buildDir = path.dirname(Platform.executable); final sdkDir = path.dirname(path.dirname(buildDir)); - final platformDill = path.join(buildDir, 'vm_platform_strong.dill'); + final platformDill = path.join(buildDir, 'vm_platform.dill'); final genKernel = path.join( sdkDir, 'pkg', diff --git a/tools/bots/flutter/compile_flutter.sh b/tools/bots/flutter/compile_flutter.sh index c7e2be8c31d..762c7424264 100755 --- a/tools/bots/flutter/compile_flutter.sh +++ b/tools/bots/flutter/compile_flutter.sh @@ -81,9 +81,9 @@ $checkout/tools/sdks/dart-sdk/bin/dart \ --single-root-scheme=org-dartlang-sdk \ --single-root-base=$checkout/ \ org-dartlang-sdk:///sdk/lib/libraries.json \ - vm_outline_strong.dill \ - vm_platform_strong.dill \ - vm_outline_strong.dill + vm_outline.dill \ + vm_platform.dill \ + vm_outline.dill $checkout/tools/sdks/dart-sdk/bin/dart \ --packages=$checkout/.dart_tool/package_config.json \ @@ -93,7 +93,7 @@ $checkout/tools/sdks/dart-sdk/bin/dart \ --single-root-scheme=org-dartlang-sdk \ --single-root-base=flutter/engine/src \ org-dartlang-sdk:///flutter/lib/snapshot/libraries.json \ - vm_outline_strong.dill \ + vm_outline.dill \ flutter_patched_sdk/platform_strong.dill \ flutter_patched_sdk/outline_strong.dill diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index b258204ed63..b8a6afe509d 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -3475,7 +3475,7 @@ "script": "${build_root}/dart", "arguments": [ "pkg/vm/bin/gen_kernel.dart", - "--platform=${build_root}/vm_platform_strong.dill", + "--platform=${build_root}/vm_platform.dill", "--no-aot", "-Dtest_runner.configuration=vm-linux-release-${arch}", "-o", @@ -3488,7 +3488,7 @@ "script": "${build_root}/dart", "arguments": [ "pkg/vm/bin/gen_kernel.dart", - "--platform=${build_root}/vm_platform_strong.dill", + "--platform=${build_root}/vm_platform.dill", "--aot", "-Dtest_runner.configuration=vm-aot-linux-release-${arch}", "-o", diff --git a/tools/bots/try_benchmarks.sh b/tools/bots/try_benchmarks.sh index c674647e6db..31839262c21 100755 --- a/tools/bots/try_benchmarks.sh +++ b/tools/bots/try_benchmarks.sh @@ -145,8 +145,8 @@ for command; do out/ReleaseX64/dart2js_platform.dill \ out/ReleaseX64/dart2wasm_outline.dill \ out/ReleaseX64/dart2wasm_platform.dill \ - out/ReleaseX64/vm_outline_strong.dill \ - out/ReleaseX64/vm_platform_strong.dill \ + out/ReleaseX64/vm_outline.dill \ + out/ReleaseX64/vm_platform.dill \ out/ReleaseX64/gen/kernel_service.dill \ out/ReleaseX64/dart-sdk \ out/ReleaseX64/dart \ @@ -195,9 +195,9 @@ EOF out/ReleaseX64/dart-sdk/bin/dart pkg/dev_compiler/tool/ddb -r d8 -b third_party/d8/linux/x64/d8 --canary --mode=compile --compile-vm-options=--print-metrics --out out.js hello.dart out/ReleaseX64/dart-sdk/bin/dart pkg/analysis_server/benchmark/benchmarks.dart run --quick --repeat 1 analysis-server-cold echo '[{"name":"foo","edits":[["pkg/compiler/lib/src/dart2js.dart","2016","2017"],["pkg/compiler/lib/src/options.dart","2016","2017"]]}]' > appjit_train_edits.json - out/ReleaseX64/dart --background-compilation=false --snapshot-kind=app-jit --snapshot=pkg/front_end/tool/incremental_perf.dart.appjit pkg/front_end/tool/incremental_perf.dart --target=vm --sdk-summary=out/ReleaseX64/vm_platform_strong.dill --sdk-library-specification=sdk/lib/libraries.json pkg/compiler/lib/src/dart2js.dart appjit_train_edits.json - out/ReleaseX64/dart --background-compilation=false pkg/front_end/tool/incremental_perf.dart.appjit --target=vm --sdk-summary=out/ReleaseX64/vm_platform_strong.dill --sdk-library-specification=sdk/lib/libraries.json pkg/front_end/benchmarks/ikg/hello.dart pkg/front_end/benchmarks/ikg/hello.edits.json - out/ReleaseX64/dart pkg/kernel/test/binary_bench.dart --golem AstFromBinaryLazy out/ReleaseX64/vm_platform_strong.dill + out/ReleaseX64/dart --background-compilation=false --snapshot-kind=app-jit --snapshot=pkg/front_end/tool/incremental_perf.dart.appjit pkg/front_end/tool/incremental_perf.dart --target=vm --sdk-summary=out/ReleaseX64/vm_platform.dill --sdk-library-specification=sdk/lib/libraries.json pkg/compiler/lib/src/dart2js.dart appjit_train_edits.json + out/ReleaseX64/dart --background-compilation=false pkg/front_end/tool/incremental_perf.dart.appjit --target=vm --sdk-summary=out/ReleaseX64/vm_platform.dill --sdk-library-specification=sdk/lib/libraries.json pkg/front_end/benchmarks/ikg/hello.dart pkg/front_end/benchmarks/ikg/hello.edits.json + out/ReleaseX64/dart pkg/kernel/test/binary_bench.dart --golem AstFromBinaryLazy out/ReleaseX64/vm_platform.dill out/ReleaseX64/run_vm_tests --dfe=out/ReleaseX64/kernel-service.dart.snapshot InitialRSS out/ReleaseX64/run_vm_tests --dfe=out/ReleaseX64/kernel-service.dart.snapshot KernelServiceCompileAll out/ReleaseX64/run_vm_tests --dfe=out/ReleaseX64/kernel-service.dart.snapshot UseDartApi diff --git a/utils/aot_snapshot.gni b/utils/aot_snapshot.gni index 032adeb3dbf..e48ec8e12f7 100644 --- a/utils/aot_snapshot.gni +++ b/utils/aot_snapshot.gni @@ -59,7 +59,7 @@ template("aot_snapshot") { 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" + platform_dill = "$root_out_dir/vm_platform.dill" inputs = extra_inputs + [ gen_kernel_kernel, diff --git a/utils/application_snapshot.gni b/utils/application_snapshot.gni index 67a01a6a45d..37037cf6548 100644 --- a/utils/application_snapshot.gni +++ b/utils/application_snapshot.gni @@ -131,7 +131,7 @@ template("application_snapshot") { 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" + platform_dill = "$root_out_dir/vm_platform.dill" inputs = extra_inputs + [ gen_kernel_kernel, diff --git a/utils/compile_platform.gni b/utils/compile_platform.gni index 9576c45f28e..78780b061cf 100644 --- a/utils/compile_platform.gni +++ b/utils/compile_platform.gni @@ -27,7 +27,7 @@ template("compile_platform") { # on vm_outline.dill. This is used to include the source code of Fasta itself # in the dependency file. Without this, a change to Fasta wouldn't cause the # platform dill files to be rebuilt. However, when building - # vm_outline_strong.dill, we shouldn't list it as a dependency as this would + # vm_outline.dill, we shouldn't list it as a dependency as this would # lead to cyclic dependencies. add_implicit_vm_platform_dependency = true if (defined(invoker.add_implicit_vm_platform_dependency)) { @@ -35,7 +35,7 @@ template("compile_platform") { invoker.add_implicit_vm_platform_dependency } - outline = "vm_outline_strong.dill" + outline = "vm_outline.dill" if (defined(invoker.outline)) { outline = invoker.outline } diff --git a/utils/gen_kernel/BUILD.gn b/utils/gen_kernel/BUILD.gn index 86b54809a08..7068091e9da 100644 --- a/utils/gen_kernel/BUILD.gn +++ b/utils/gen_kernel/BUILD.gn @@ -14,7 +14,7 @@ prebuilt_dart_action("bootstrap_gen_kernel") { "$_dart_root/runtime/vm:vm_platform", ] gen_kernel_script = "$_dart_root/pkg/vm/bin/gen_kernel.dart" - platform_dill = "$root_out_dir/vm_platform_strong.dill" + platform_dill = "$root_out_dir/vm_platform.dill" package_config = rebase_path("$_dart_root/.dart_tool/package_config.json") inputs = [ diff --git a/utils/kernel-service/BUILD.gn b/utils/kernel-service/BUILD.gn index d029ef27d3e..34b7b85e18b 100644 --- a/utils/kernel-service/BUILD.gn +++ b/utils/kernel-service/BUILD.gn @@ -59,7 +59,7 @@ application_snapshot("frontend_server") { training_args = [ "--train", "--sdk-root=$sdk_root/", - "--platform=$sdk_root/vm_platform_strong.dill", + "--platform=$sdk_root/vm_platform.dill", rebase_path(main_dart), ] output = "$root_out_dir/frontend_server.dart.snapshot" @@ -101,7 +101,7 @@ template("kernel_service_dill") { ] inputs = [ kernel_service_script, - "$root_out_dir/vm_platform_strong.dill", + "$root_out_dir/vm_platform.dill", ] output = "$root_gen_dir/kernel_service" + invoker.target_name + ".dill" outputs = [ output ] @@ -124,8 +124,8 @@ template("kernel_service_dill") { # consuming/producing kernel. "-Dsdk_hash=$sdk_hash", "--packages=" + scheme + ":///.dart_tool/package_config.json", - "--platform=" + rebase_path("$root_out_dir/vm_platform_strong.dill", - root_build_dir), + "--platform=" + + rebase_path("$root_out_dir/vm_platform.dill", root_build_dir), "--filesystem-root=" + rebase_path("../../"), "--filesystem-scheme=" + scheme, "--no-aot", @@ -146,7 +146,7 @@ template("kernel_service_dill") { inputs = [ gen_kernel_script, kernel_service_script, - "$root_out_dir/vm_platform_strong.dill", + "$root_out_dir/vm_platform.dill", ] output = "$root_gen_dir/kernel_service" + invoker.target_name + ".dill" outputs = [ output ] @@ -165,21 +165,20 @@ template("kernel_service_dill") { script = gen_kernel_script scheme = "org-dartlang-kernel-service" - args = - invoker.extra_args + [ - # Ensure the compiled kernel-service will use this SDK hash when - # consuming/producing kernel. - "-Dsdk_hash=$sdk_hash", + args = invoker.extra_args + [ + # Ensure the compiled kernel-service will use this SDK hash when + # consuming/producing kernel. + "-Dsdk_hash=$sdk_hash", - "--packages=" + scheme + ":///.dart_tool/package_config.json", - "--platform=" + rebase_path("$root_out_dir/vm_platform_strong.dill", - root_build_dir), - "--filesystem-root=" + rebase_path("../../"), - "--filesystem-scheme=" + scheme, - "--no-aot", - "--no-embed-sources", - "--output=" + rebase_path(output, root_build_dir), - ] + "--packages=" + scheme + ":///.dart_tool/package_config.json", + "--platform=" + rebase_path("$root_out_dir/vm_platform.dill", + root_build_dir), + "--filesystem-root=" + rebase_path("../../"), + "--filesystem-scheme=" + scheme, + "--no-aot", + "--no-embed-sources", + "--output=" + rebase_path(output, root_build_dir), + ] args += [ scheme + ":///pkg/vm/bin/kernel_service.dart" ] } }