Index: dart/pkg/dart2js_incremental/lib/dart2js_incremental.dart |
diff --git a/dart/pkg/dart2js_incremental/lib/dart2js_incremental.dart b/dart/pkg/dart2js_incremental/lib/dart2js_incremental.dart |
index d66bffe629fcc0ade9aca9bdcbf4ec3c3d5e655b..ddaa79d70c6de53357fa7ef46f60a00402a7e75c 100644 |
--- a/dart/pkg/dart2js_incremental/lib/dart2js_incremental.dart |
+++ b/dart/pkg/dart2js_incremental/lib/dart2js_incremental.dart |
@@ -47,6 +47,8 @@ class IncrementalCompiler { |
Compiler _compiler; |
+ bool get compilerWasCancelled => _compiler.compilerWasCancelled; |
+ |
IncrementalCompiler({ |
this.libraryRoot, |
this.packageRoot, |
@@ -67,7 +69,8 @@ class IncrementalCompiler { |
} |
Future<bool> compile(Uri script) { |
- List<String> options = new List<String>.from(this.options); |
+ List<String> options = this.options == null |
+ ? <String> [] : new List<String>.from(this.options); |
options.addAll(INCREMENTAL_OPTIONS); |
Future<Compiler> future = reuseCompiler( |
cachedCompiler: _compiler, |