| Index: pkg/dart2js_incremental/lib/caching_compiler.dart
|
| diff --git a/pkg/dart2js_incremental/lib/caching_compiler.dart b/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| index 4185df1c46b8be92bb1e72bc2a37a9d08b97cb64..f7f8f1004f69989bb05cf5484906e6d2f14a1834 100644
|
| --- a/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| +++ b/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| @@ -36,11 +36,11 @@ Future<CompilerImpl> reuseCompiler(
|
| CompilerImpl compiler = cachedCompiler;
|
| if (compiler == null ||
|
| compiler.libraryRoot != libraryRoot ||
|
| - !compiler.hasIncrementalSupport ||
|
| + !compiler.options.hasIncrementalSupport ||
|
| compiler.hasCrashed ||
|
| compiler.enqueuer.resolution.hasEnqueuedReflectiveElements ||
|
| compiler.deferredLoadTask.isProgramSplit) {
|
| - if (compiler != null && compiler.hasIncrementalSupport) {
|
| + if (compiler != null && compiler.options.hasIncrementalSupport) {
|
| print('***FLUSH***');
|
| if (compiler.hasCrashed) {
|
| print('Unable to reuse compiler due to crash.');
|
| @@ -57,12 +57,11 @@ Future<CompilerImpl> reuseCompiler(
|
| inputProvider,
|
| outputProvider,
|
| diagnosticHandler,
|
| - libraryRoot,
|
| - packageRoot,
|
| - options,
|
| - environment,
|
| - null,
|
| - null);
|
| + new CompilerOptions.parse(
|
| + libraryRoot: libraryRoot,
|
| + packageRoot: packageRoot,
|
| + options: options,
|
| + environment: environment));
|
| JavaScriptBackend backend = compiler.backend;
|
|
|
| full.Emitter emitter = backend.emitter.emitter;
|
|
|