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

Add support for dart2js targets to kernel_worker

Browse source 
This includes a `--target` flag (that in the future we can use for other targets
too) and a flag to accept the libraries.json file (currently needed to properly
compute constants of the form `bool.fromEnvironment('dart.library.io')`.

Change-Id: I8beea48610f0e1e721b7c76e545c9f662e3255ad
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/96849
Commit-Queue: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Jake Macdonald <jakemac@google.com>
This commit is contained in:
Sigmund Cherem 2019-03-15 18:02:10 +00:00 committed by commit-bot@chromium.org
parent 9b185051a9
commit 74a23b96b0
2 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/front_end/lib/src/api_unstable/bazel_worker.dart
View file

@ -37,6 +37,7 @@ export 'compiler_state.dart' show InitializedCompilerState;
Future<InitializedCompilerState> initializeCompiler(
InitializedCompilerState oldState,
Uri sdkSummary,
Uri librariesSpecificationUri,
Uri packagesFile,
List<Uri> summaryInputs,
List<Uri> linkedInputs,
@ -50,6 +51,7 @@ Future<InitializedCompilerState> initializeCompiler(
CompilerOptions options = new CompilerOptions()
..sdkSummary = sdkSummary
..packagesFileUri = packagesFile
..librariesSpecificationUri = librariesSpecificationUri
..inputSummaries = summaryInputs
..linkedDependencies = linkedInputs
..target = target

56
utils/bazel/kernel_worker.dart
View file

@ -19,6 +19,7 @@ import 'package:front_end/src/api_unstable/bazel_worker.dart' as fe;
import 'package:kernel/ast.dart' show Component, Library;
import 'package:kernel/target/targets.dart';
import 'package:vm/target/vm.dart';
import 'package:compiler/src/kernel/dart2js_target.dart';
main(List<String> args) async {
args = preprocessArgs(args);
@ -83,7 +84,7 @@ List<String> preprocessArgs(List<String> args) {
/// An [ArgParser] for generating kernel summaries.
final summaryArgsParser = new ArgParser()
..addFlag('help', negatable: false)
..addFlag('help', negatable: false, abbr: 'h')
..addFlag('exclude-non-sources',
negatable: false,
help: 'Whether source files loaded implicitly should be included as '
@ -92,11 +93,15 @@ final summaryArgsParser = new ArgParser()
defaultsTo: true,
negatable: true,
help: 'Whether to only build summary files.')
..addOption('target',
allowed: const ['vm', 'dart2js', 'devcompiler'],
help: 'Build kernel for the vm, dart2js, or devcompiler')
..addOption('dart-sdk-summary')
..addMultiOption('input-summary')
..addMultiOption('input-linked')
..addMultiOption('multi-root')
..addOption('multi-root-scheme', defaultsTo: 'org-dartlang-multi-root')
..addOption('libraries-file')
..addOption('packages-file')
..addMultiOption('source')
..addOption('output');
@ -128,20 +133,55 @@ Future<bool> computeKernel(List<String> args,
if (multiRoots.isEmpty) multiRoots.add(Uri.base);
var fileSystem = new MultiRootFileSystem(parsedArgs['multi-root-scheme'],
multiRoots, fe.StandardFileSystem.instance);
var sources = (parsedArgs['source'] as List<String>).map(Uri.parse).toList();
Target target;
var summaryOnly = parsedArgs['summary-only'] as bool;
var sources =
(parsedArgs['source'] as List<String>).map(Uri.base.resolve).toList();
var excludeNonSources = parsedArgs['exclude-non-sources'] as bool;
var summaryOnly = parsedArgs['summary-only'] as bool;
// TODO(sigmund,jakemac): make target mandatory. We allow null to be backwards
// compatible while we migrate existing clients of this tool.
var targetName =
(parsedArgs['target'] as String) ?? (summaryOnly ? 'devcompiler' : 'vm');
var targetFlags = new TargetFlags();
if (summaryOnly) {
target = new SummaryTarget(sources, excludeNonSources, targetFlags);
} else {
target = new VmTarget(targetFlags);
Target target;
switch (targetName) {
case 'vm':
target = new VmTarget(targetFlags);
if (summaryOnly) {
out.writeln('error: --summary-only not supported for the vm target');
}
break;
case 'dart2js':
target = new Dart2jsTarget('dart2js', targetFlags);
if (summaryOnly) {
out.writeln(
'error: --summary-only not supported for the dart2js target');
}
break;
case 'devcompiler':
// TODO(jakemac): change to a subclass of `DevCompilerTarget`. If
// `generateKernel` changes to return a summary component, use the default
// `DevCompilerTarget` and post process the component instead.
target = new SummaryTarget(sources, excludeNonSources, targetFlags);
if (!summaryOnly) {
out.writeln('error: --no-summary-only not supported for the '
'devcompiler target');
}
break;
default:
out.writeln('error: unsupported target: $targetName');
}
// TODO(sigmund,jakemac): make it mandatory. We allow null while we migrate
// existing clients of this tool.
var librariesSpec = parsedArgs['libraries-file'] == null
? null
: Uri.base.resolve(parsedArgs['libraries-file']);
var state = await fe.initializeCompiler(
// TODO(sigmund): pass an old state once we can make use of it.
null,
Uri.base.resolve(parsedArgs['dart-sdk-summary']),
librariesSpec,
Uri.base.resolve(parsedArgs['packages-file']),
(parsedArgs['input-summary'] as List<String>)
.map(Uri.base.resolve)