| 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 5582bab2098bfe0f31299e8c34adb8199440bb92..8c6357fd5cd9c620dd765eaec0b2e151ee72b1f9 100644
|
| --- a/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| +++ b/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| @@ -35,17 +35,19 @@ Future<CompilerImpl> reuseCompiler(
|
| environment = {};
|
| }
|
| CompilerImpl compiler = cachedCompiler;
|
| + JavaScriptBackend backend = compiler?.backend;
|
| if (compiler == null ||
|
| compiler.libraryRoot != libraryRoot ||
|
| !compiler.options.hasIncrementalSupport ||
|
| compiler.hasCrashed ||
|
| - compiler.enqueuer.resolution.hasEnqueuedReflectiveElements ||
|
| + backend.mirrorsAnalysis.resolutionHandler.hasEnqueuedReflectiveElements ||
|
| compiler.deferredLoadTask.isProgramSplit) {
|
| if (compiler != null && compiler.options.hasIncrementalSupport) {
|
| print('***FLUSH***');
|
| if (compiler.hasCrashed) {
|
| print('Unable to reuse compiler due to crash.');
|
| - } else if (compiler.enqueuer.resolution.hasEnqueuedReflectiveElements) {
|
| + } else if (backend.mirrorsAnalysis.resolutionHandler
|
| + .hasEnqueuedReflectiveElements) {
|
| print('Unable to reuse compiler due to dart:mirrors.');
|
| } else if (compiler.deferredLoadTask.isProgramSplit) {
|
| print('Unable to reuse compiler due to deferred loading.');
|
| @@ -64,7 +66,7 @@ Future<CompilerImpl> reuseCompiler(
|
| packageConfig: packageConfig,
|
| options: options,
|
| environment: environment));
|
| - JavaScriptBackend backend = compiler.backend;
|
| + backend = compiler.backend;
|
|
|
| full.Emitter emitter = backend.emitter.emitter;
|
|
|
| @@ -83,8 +85,7 @@ Future<CompilerImpl> reuseCompiler(
|
| // Likewise, always be prepared for runtimeType support.
|
| // TODO(johnniwinther): Add global switch to force RTI.
|
| compiler.enabledRuntimeType = true;
|
| - backend.registerRuntimeType(
|
| - compiler.enqueuer.resolution, compiler.globalDependencies);
|
| + backend.registerRuntimeType(compiler.enqueuer.resolution);
|
| return compiler;
|
| });
|
| });
|
|
|