languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 02:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cfe] Use generateKernelInternal in BatchCompiler

Browse source 
Closes #54924

Change-Id: Ie7b12722b9ee5ff360345faab774e840117ee9d0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/353266
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
This commit is contained in:
Johnni Winther 2024-02-23 10:14:43 +00:00 committed by Commit Queue
parent 79bba81cd8
commit 449d73697c
4 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/front_end/lib/src/base/processed_options.dart
View file

@ -193,6 +193,8 @@ class ProcessedOptions {
bool get enableUnscheduledExperiments => _raw.enableUnscheduledExperiments;
bool get hasAdditionalDills => _raw.additionalDills.isNotEmpty;
/// The entry-points provided to the compiler.
final List<Uri> inputs;

19
pkg/front_end/lib/src/kernel_generator_impl.dart
View file

@ -80,17 +80,20 @@ Future<CompilerResult> generateKernelInternal(
List<Component> loadedComponents = <Component>[];
Component? sdkSummary = await options.loadSdkSummary(null);
// By using the nameRoot of the summary, we enable sharing the
// sdkSummary between multiple invocations.
CanonicalName nameRoot = sdkSummary?.root ?? new CanonicalName.root();
if (sdkSummary != null) {
dillTarget.loader.appendLibraries(sdkSummary);
}
for (Component additionalDill
in await options.loadAdditionalDills(nameRoot)) {
loadedComponents.add(additionalDill);
dillTarget.loader.appendLibraries(additionalDill);
// By using the nameRoot of the summary, we enable sharing the
// sdkSummary between multiple invocations.
CanonicalName? nameRoot;
if (options.hasAdditionalDills) {
nameRoot = sdkSummary?.root ?? new CanonicalName.root();
for (Component additionalDill
in await options.loadAdditionalDills(nameRoot)) {
loadedComponents.add(additionalDill);
dillTarget.loader.appendLibraries(additionalDill);
}
}
dillTarget.buildOutlines();
@ -133,7 +136,7 @@ Future<CompilerResult> generateKernelInternal(
Future<CompilerResult> _buildInternal(
{required ProcessedOptions options,
required KernelTarget kernelTarget,
required CanonicalName nameRoot,
required CanonicalName? nameRoot,
required Component? sdkSummary,
required List<Component> loadedComponents,
required bool buildSummary,

3
pkg/front_end/test/fasta/messages_suite.dart
View file

@ -795,7 +795,8 @@ class Compile extends Step<Example?, Null, MessageTestSuite> {
..fileSystem = new HybridFileSystem(suite.fileSystem)
..packagesFileUri = packageConfigUri
..onDiagnostic = messages.add
..environmentDefines = const {}),
..environmentDefines = const {}
..omitPlatform = true),
main,
output);

24
pkg/front_end/tool/_fasta/entry_points.dart
View file

@ -14,6 +14,7 @@ import 'package:_fe_analyzer_shared/src/util/relativize.dart'
import 'package:front_end/src/api_prototype/compiler_options.dart'
show CompilerOptions;
import 'package:front_end/src/api_prototype/kernel_generator.dart';
import 'package:front_end/src/base/command_line_options.dart';
import 'package:front_end/src/base/processed_options.dart'
show ProcessedOptions;
import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext;
@ -229,7 +230,10 @@ class BatchCompiler {
Future<bool> batchCompileArguments(List<String> arguments) {
return runProtectedFromAbort<bool>(
() => withGlobalOptions<bool>("compile", arguments, true,
() => withGlobalOptions<bool>(
"compile",
[Flags.omitPlatform, ...arguments],
true,
(CompilerContext c, _) => batchCompileImpl(c)),
false);
}
@ -243,8 +247,6 @@ class BatchCompiler {
Future<bool> batchCompileImpl(CompilerContext c) async {
ProcessedOptions options = c.options;
bool verbose = options.verbose;
Ticker ticker = new Ticker(isVerbose: verbose);
if (platformComponent == null ||
platformUri != options.sdkSummary ||
hadVerifyError) {
@ -257,8 +259,12 @@ class BatchCompiler {
} else {
options.sdkSummaryComponent = platformComponent!;
}
CompileTask task = new CompileTask(c, ticker);
await task.compile(omitPlatform: true, supportAdditionalDills: false);
assert(options.omitPlatform,
"Platform must be omitted for the batch compiler.");
assert(!options.hasAdditionalDills,
"Additional dills are not supported for the batch compiler.");
CompilerResult compilerResult = await generateKernelInternal();
await _emitComponent(c, compilerResult.component!);
CanonicalName root = platformComponent!.root;
for (Library library in platformComponent!.libraries) {
library.parent = platformComponent;
@ -317,7 +323,7 @@ Future<Uri> compile(List<String> arguments, {Benchmarker? benchmarker}) async {
CompilerResult compilerResult =
await generateKernelInternal(benchmarker: benchmarker);
Component component = compilerResult.component!;
Uri uri = await _emitComponent(c, component, benchmarker);
Uri uri = await _emitComponent(c, component, benchmarker: benchmarker);
_benchmarkAstVisitor(component, benchmarker);
return uri;
});
@ -494,15 +500,15 @@ class CompileTask {
libraryFilter: kernelTarget.isSourceLibraryForDebugging,
showOffsets: c.options.debugDumpShowOffsets);
}
Uri uri = await _emitComponent(c, component, benchmarker);
Uri uri = await _emitComponent(c, component, benchmarker: benchmarker);
_benchmarkAstVisitor(component, benchmarker);
return uri;
}
}
/// Writes the [component] to the URI specified in the compiler options.
Future<Uri> _emitComponent(
CompilerContext c, Component component, Benchmarker? benchmarker) async {
Future<Uri> _emitComponent(CompilerContext c, Component component,
{Benchmarker? benchmarker}) async {
Uri uri = c.options.output!;
if (c.options.omitPlatform) {
benchmarker?.enterPhase(BenchmarkPhases.omitPlatform);