| 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 343a94b3783fbaacc27f11d3ad6c449a6b90908e..50893ef0b86f32607ea8eb745a978c13f02c96aa 100644
|
| --- a/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| +++ b/pkg/dart2js_incremental/lib/caching_compiler.dart
|
| @@ -65,9 +65,11 @@ Future<Compiler> reuseCompiler(
|
| null);
|
| JavaScriptBackend backend = compiler.backend;
|
|
|
| + OldEmitter emitter = backend.emitter.emitter;
|
| +
|
| // Much like a scout, an incremental compiler is always prepared. For
|
| // mixins, classes, and lazy statics, at least.
|
| - backend.emitter.oldEmitter
|
| + emitter
|
| ..needsClassSupport = true
|
| ..needsMixinSupport = true
|
| ..needsLazyInitializer = true
|
| @@ -100,19 +102,20 @@ Future<Compiler> reuseCompiler(
|
| ..enqueuer.codegen.hasEnqueuedReflectiveStaticFields = false
|
| ..compilationFailed = false;
|
| JavaScriptBackend backend = compiler.backend;
|
| + OldEmitter emitter = backend.emitter.emitter;
|
|
|
| // TODO(ahe): Seems this cache only serves to tell
|
| - // [OldEmitter.invalidateCaches] if it was invoked on a full compile (in
|
| + // [emitter.invalidateCaches] if it was invoked on a full compile (in
|
| // which case nothing should be invalidated), or if it is an incremental
|
| // compilation (in which case, holders/owners of newly compiled methods
|
| // must be invalidated).
|
| - backend.emitter.oldEmitter.cachedElements.add(null);
|
| + emitter.cachedElements.add(null);
|
|
|
| compiler.enqueuer.codegen
|
| ..newlyEnqueuedElements.clear()
|
| ..newlySeenSelectors.clear();
|
|
|
| - backend.emitter.oldEmitter.nsmEmitter
|
| + emitter.nsmEmitter
|
| ..trivialNsmHandlers.clear();
|
|
|
| backend.emitter.typeTestRegistry
|
| @@ -121,7 +124,7 @@ Future<Compiler> reuseCompiler(
|
| ..rtiNeededClasses.clear()
|
| ..cachedClassesUsingTypeVariableTests = null;
|
|
|
| - backend.emitter.oldEmitter.interceptorEmitter
|
| + emitter.interceptorEmitter
|
| ..interceptorInvocationNames.clear();
|
|
|
| backend.emitter.nativeEmitter
|
| @@ -130,7 +133,7 @@ Future<Compiler> reuseCompiler(
|
|
|
| backend.emitter.readTypeVariables.clear();
|
|
|
| - backend.emitter.oldEmitter
|
| + emitter
|
| ..outputBuffers.clear()
|
| ..classesCollector = null
|
| ..mangledFieldNames.clear()
|
|
|