languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-20 09:27:03 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[vm/kernel] Run global transformations only if there are no errors

Browse source 
Change-Id: Ia3b059e75f36488f1ec4ee8ef49037d66f22612c
Reviewed-on: https://dart-review.googlesource.com/30469
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
This commit is contained in:
Alexander Markov 2017-12-20 18:36:52 +00:00 committed by commit-bot@chromium.org
parent 705904befd
commit 4ace8d42c0
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/vm/bin/gen_kernel.dart
View file

@ -12,7 +12,7 @@ import 'package:kernel/kernel.dart' show Program;
import 'package:kernel/src/tool/batch_util.dart' as batch_util;
import 'package:kernel/target/targets.dart' show TargetFlags;
import 'package:kernel/target/vm.dart' show VmTarget;
import 'package:vm/kernel_front_end.dart' show compileToKernel;
import 'package:vm/kernel_front_end.dart' show compileToKernel, ErrorDetector;
final ArgParser _argParser = new ArgParser(allowTrailingOptions: true)
..addOption('platform',
@ -60,7 +60,7 @@ Future<int> compile(List<String> arguments) async {
final bool strongMode = options['strong-mode'];
final bool aot = options['aot'];
int errors = 0;
ErrorDetector errorDetector = new ErrorDetector();
final CompilerOptions compilerOptions = new CompilerOptions()
..strongMode = strongMode
@ -68,18 +68,13 @@ Future<int> compile(List<String> arguments) async {
..linkedDependencies = <Uri>[Uri.base.resolve(platformKernel)]
..packagesFileUri = packages != null ? Uri.base.resolve(packages) : null
..reportMessages = true
..onError = (CompilationMessage message) {
if ((message.severity != Severity.nit) &&
(message.severity != Severity.warning)) {
++errors;
}
};
..onError = errorDetector;
Program program = await compileToKernel(
Uri.base.resolve(filename), compilerOptions,
aot: aot);
if ((errors > 0) || (program == null)) {
if (errorDetector.hasCompilationErrors || (program == null)) {
return _compileTimeErrorExitCode;
}

33
pkg/vm/lib/kernel_front_end.dart
View file

@ -7,9 +7,13 @@ library vm.kernel_front_end;
import 'dart:async';
import 'package:front_end/src/api_prototype/compiler_options.dart';
import 'package:front_end/src/api_prototype/compiler_options.dart'
show CompilerOptions, ErrorHandler;
import 'package:front_end/src/api_prototype/kernel_generator.dart'
show kernelForProgram;
import 'package:front_end/src/api_prototype/compilation_message.dart'
show CompilationMessage, Severity;
import 'package:front_end/src/fasta/severity.dart' show Severity;
import 'package:kernel/ast.dart' show Program;
import 'package:kernel/core_types.dart' show CoreTypes;
@ -23,9 +27,18 @@ import 'transformations/cha_devirtualization.dart' as chaDevirtualization
///
Future<Program> compileToKernel(Uri source, CompilerOptions options,
{bool aot: false}) async {
// Replace error handler to detect if there are compilation errors.
final errorDetector =
new ErrorDetector(previousErrorHandler: options.onError);
options.onError = errorDetector;
final program = await kernelForProgram(source, options);
if (aot && (program != null)) {
// Restore error handler (in case 'options' are reused).
options.onError = errorDetector.previousErrorHandler;
// Run global transformations only if program is correct.
if (aot && (program != null) && !errorDetector.hasCompilationErrors) {
_runGlobalTransformations(program, options.strongMode);
}
@ -41,3 +54,19 @@ _runGlobalTransformations(Program program, bool strongMode) {
chaDevirtualization.transformProgram(coreTypes, program);
}
}
class ErrorDetector {
final ErrorHandler previousErrorHandler;
bool hasCompilationErrors = false;
ErrorDetector({this.previousErrorHandler});
void call(CompilationMessage message) {
if ((message.severity != Severity.nit) &&
(message.severity != Severity.warning)) {
hasCompilationErrors = true;
}
previousErrorHandler?.call(message);
}
}