| Index: pkg/dart2js_incremental/lib/library_updater.dart
|
| diff --git a/pkg/dart2js_incremental/lib/library_updater.dart b/pkg/dart2js_incremental/lib/library_updater.dart
|
| index c62c1206c6ea75633c4e1057a08301c476ecfff4..6e3dd241ec87e5af6e7ef00a812672963eb78c8e 100644
|
| --- a/pkg/dart2js_incremental/lib/library_updater.dart
|
| +++ b/pkg/dart2js_incremental/lib/library_updater.dart
|
| @@ -63,10 +63,12 @@ import 'package:compiler/src/js_emitter/js_emitter.dart' show
|
| ClassEmitter,
|
| CodeEmitterTask,
|
| ContainerBuilder,
|
| - OldEmitter,
|
| MemberInfo,
|
| computeMixinClass;
|
|
|
| +import 'package:compiler/src/js_emitter/full_emitter/emitter.dart'
|
| + as full show Emitter;
|
| +
|
| import 'package:compiler/src/js_emitter/model.dart' show
|
| Class,
|
| Method;
|
| @@ -898,7 +900,7 @@ class LibraryUpdater extends JsFeatures {
|
| if (constants != null) {
|
| for (ConstantValue constant in constants) {
|
| if (!_compiledConstants.contains(constant)) {
|
| - OldEmitter fullEmitter = emitter.emitter;
|
| + full.Emitter fullEmitter = emitter.emitter;
|
| jsAst.Statement constantInitializer =
|
| fullEmitter.buildConstantInitializer(constant).toStatement();
|
| updates.add(constantInitializer);
|
| @@ -977,7 +979,7 @@ if (this.pendingStubs) {
|
| }
|
| // A static (or top-level) field.
|
| if (backend.constants.lazyStatics.contains(element)) {
|
| - OldEmitter fullEmitter = emitter.emitter;
|
| + full.Emitter fullEmitter = emitter.emitter;
|
| jsAst.Expression init =
|
| fullEmitter.buildLazilyInitializedStaticField(
|
| element, isolateProperties: namer.currentIsolate);
|
| @@ -1473,7 +1475,7 @@ abstract class JsFeatures {
|
| CodeEmitterTask get emitter => backend.emitter;
|
|
|
| ContainerBuilder get containerBuilder {
|
| - OldEmitter fullEmitter = emitter.emitter;
|
| + full.Emitter fullEmitter = emitter.emitter;
|
| return fullEmitter.containerBuilder;
|
| }
|
|
|
| @@ -1486,7 +1488,7 @@ class EmitterHelper extends JsFeatures {
|
| EmitterHelper(this.compiler);
|
|
|
| ClassEmitter get classEmitter {
|
| - OldEmitter fullEmitter = emitter.emitter;
|
| + full.Emitter fullEmitter = emitter.emitter;
|
| return fullEmitter.classEmitter;
|
| }
|
|
|
|
|