| Index: pkg/fletchc/lib/incremental/fletchc_incremental.dart
|
| diff --git a/pkg/fletchc/lib/incremental/fletchc_incremental.dart b/pkg/fletchc/lib/incremental/fletchc_incremental.dart
|
| index 22eca47f00131dab0c049004fae2007a20997bac..27f7a7b4c660704852c67e1924709521792033cd 100644
|
| --- a/pkg/fletchc/lib/incremental/fletchc_incremental.dart
|
| +++ b/pkg/fletchc/lib/incremental/fletchc_incremental.dart
|
| @@ -12,7 +12,7 @@ import 'dart:developer' show
|
| UserTag;
|
|
|
| import 'package:compiler/src/apiimpl.dart' show
|
| - Compiler;
|
| + CompilerImpl;
|
|
|
| import 'package:compiler/compiler_new.dart' show
|
| CompilerDiagnostics,
|
| @@ -148,7 +148,7 @@ class IncrementalCompiler {
|
| /// that is compiled is determined by tree shaking.
|
| Future<bool> compile(Uri script) {
|
| _compiler = null;
|
| - return _reuseCompiler(null).then((Compiler compiler) {
|
| + return _reuseCompiler(null).then((CompilerImpl compiler) {
|
| _compiler = compiler;
|
| return compiler.run(script);
|
| });
|
| @@ -164,7 +164,8 @@ class IncrementalCompiler {
|
| _compiler = null;
|
| int initialErrorCount = _context.errorCount;
|
| int initialProblemCount = _context.problemCount;
|
| - return _reuseCompiler(null, analyzeOnly: true).then((Compiler compiler) {
|
| + return _reuseCompiler(null, analyzeOnly: true).then(
|
| + (CompilerImpl compiler) {
|
| // Don't try to reuse the compiler object.
|
| return compiler.run(script).then((_) {
|
| return _context.problemCount == initialProblemCount
|
| @@ -176,7 +177,7 @@ class IncrementalCompiler {
|
| });
|
| }
|
|
|
| - Future<Compiler> _reuseCompiler(
|
| + Future<CompilerImpl> _reuseCompiler(
|
| Future<bool> reuseLibrary(LibraryElement library),
|
| {bool analyzeOnly: false}) {
|
| List<String> options = this.options == null
|
| @@ -233,7 +234,8 @@ class IncrementalCompiler {
|
| logVerbose,
|
| _context);
|
| _context.registerUriWithUpdates(updatedFiles.keys);
|
| - return _reuseCompiler(updater.reuseLibrary).then((Compiler compiler) async {
|
| + return _reuseCompiler(updater.reuseLibrary).then(
|
| + (CompilerImpl compiler) async {
|
| _compiler = compiler;
|
| FletchDelta delta = await updater.computeUpdateFletch(currentSystem);
|
| _checkCompilationFailed();
|
|
|