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

Use batch mode compilation for normal -cdartkp

Browse source 
Issue https://github.com/dart-lang/sdk/issues/31585

Change-Id: I70790a33cfbfbc7c2c48c6e77074f955d6de7e01
Reviewed-on: https://dart-review.googlesource.com/28280
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
This commit is contained in:
Martin Kustermann 2017-12-12 13:47:11 +00:00 committed by commit-bot@chromium.org
parent 756c2984a4
commit d1ed915244
2 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/vm/tool/gen_kernel
View file

@ -25,6 +25,8 @@ CUR_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
SDK_DIR="$CUR_DIR/../../.."
# TODO(kustermann): For windows as well as for hosts running on arm, our
# checked-in dart binaries must be adjusted.
if [[ `uname` == 'Darwin' ]]; then
DART="$SDK_DIR/tools/sdks/mac/dart-sdk/bin/dart"
OUT_DIR="$SDK_DIR/xcodebuild"

43
tools/testing/dart/compiler_configuration.dart
View file

@ -574,18 +574,14 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
List<String> arguments, Map<String, String> environmentOverrides) {
var commands = <Command>[];
if (_isStrong) {
commands.add(computeCompileToKernelCommand(
tempDir, arguments, environmentOverrides));
}
commands.add(computeCompileToKernelCommand(
tempDir, arguments, environmentOverrides));
commands.add(
computeCompilationCommand(tempDir, arguments, environmentOverrides));
computeDartBootstrapCommand(tempDir, arguments, environmentOverrides));
if (_isStrong) {
commands.add(computeRemoveKernelFileCommand(
tempDir, arguments, environmentOverrides));
}
commands.add(computeRemoveKernelFileCommand(
tempDir, arguments, environmentOverrides));
if (!_configuration.useBlobs) {
commands.add(
@ -604,14 +600,25 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
Map<String, String> environmentOverrides) {
final genKernel =
Platform.script.resolve('../../../pkg/vm/tool/gen_kernel').toFilePath();
final kernelBinariesFolder = _useSdk
? '${_configuration.buildDirectory}/dart-sdk/lib/_internal'
: '${_configuration.buildDirectory}';
final vmPlatform = _isStrong
? '$kernelBinariesFolder/vm_platform_strong.dill'
: '$kernelBinariesFolder/vm_platform.dill';
final dillFile = tempKernelFile(tempDir);
var args = [
final args = [
'--aot',
'--platform=${_configuration.buildDirectory}/vm_platform_strong.dill',
_isStrong ? '--strong-mode' : '--no-strong-mode',
'--platform=$vmPlatform',
'-o',
dillFile,
];
args.add(arguments.where((name) => name.endsWith('.dart')).single);
return Command.vmKernelCompilation(dillFile, true, bootstrapDependencies(),
genKernel, args, environmentOverrides);
}
@ -631,7 +638,7 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
alwaysCompile: !_useSdk);
}
Command computeCompilationCommand(String tempDir, List<String> arguments,
Command computeDartBootstrapCommand(String tempDir, List<String> arguments,
Map<String, String> environmentOverrides) {
var buildDir = _configuration.buildDirectory;
String exec;
@ -645,17 +652,7 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
exec = "$buildDir/dart_bootstrap";
}
var args = <String>[];
if (useDfe) {
if (!_isStrong) {
args.add('--dfe=pkg/vm/bin/kernel_service.dart');
args.add('--kernel-binaries=' +
(_useSdk
? '${_configuration.buildDirectory}/dart-sdk/lib/_internal'
: '${buildDir}'));
}
}
final args = <String>[];
args.add("--snapshot-kind=app-aot");
if (_configuration.useBlobs) {
args.add("--snapshot=$tempDir/out.aotsnapshot");