Follow up to CL 764533002.

dart/pkg/dart2js_incremental/lib/library_updater.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js_incremental.library_updater;
 
 import 'dart:async' show
     Future;
 
 import 'dart:convert' show
@@ skipping 600 matching lines @@
 
     List<jsAst.Statement> updates = <jsAst.Statement>[];
 
     Set<ClassElementX> newClasses = new Set.from(
         compiler.codegenWorld.directlyInstantiatedClasses);
     newClasses.removeAll(_directlyInstantiatedClasses);
 
     if (!newClasses.isEmpty) {
       // Ask the emitter to compute "needs" (only) if new classes were
       // instantiated.
-      _ensureNeedsComputed();
+      _ensureAllNeededEntitiesComputed();
       newClasses = new Set.from(emitter.neededClasses);
       newClasses.removeAll(_emittedClasses);
     } else {
       // Make sure that the set of emitted classes is preserved for subsequent
       // updates.
       // TODO(ahe): This is a bit convoluted, find a better approach.
       emitter.neededClasses
           ..clear()
           ..addAll(_emittedClasses);
     }
 
     List<jsAst.Statement> inherits = <jsAst.Statement>[];
 
     for (ClassElementX cls in newClasses) {
       jsAst.Node classAccess = emitter.classAccess(cls);
       String name = namer.getNameOfClass(cls);
 
       updates.add(
           js.statement(
               r'# = #', [classAccess, invokeDefineClass(cls)]));
 
       ClassElement superclass = cls.superclass;
       if (superclass != null) {
         jsAst.Node superAccess = emitter.classAccess(superclass);
         inherits.add(
             js.statement(
-                r'self.$dart_unsafe_eval.inheritFrom(#, #)',
-                [classAccess, superAccess]));
+                r'#.inheritFrom(#, #)', [helper, classAccess, superAccess]));
       }
     }
 
     // Call inheritFrom after all classes have been created. This way we don't
     // need to sort the classes by having superclasses defined before their
     // subclasses.
     updates.addAll(inherits);
 
     for (ClassElementX cls in changedClasses) {
       ClassElement superclass = cls.superclass;
       jsAst.Node superAccess =
           superclass == null ? js('null')
               : emitter.classAccess(superclass);
       jsAst.Node classAccess = emitter.classAccess(cls);
       updates.add(
           js.statement(
-              r'# = self.$dart_unsafe_eval.schemaChange(#, #, #)',
-              [classAccess, invokeDefineClass(cls), classAccess, superAccess]));
+              r'# = #.schemaChange(#, #, #)',
+              [classAccess, helper,
+               invokeDefineClass(cls), classAccess, superAccess]));
     }
 
     for (RemovalUpdate update in removals) {
       update.writeUpdateJsOn(updates);
     }
     for (Element element in enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isField) {
         updates.addAll(computeFieldUpdateJs(element));
       } else {
         updates.add(computeMethodUpdateJs(element));
       }
     }
 
     Set<ConstantValue> newConstants = new Set<ConstantValue>.identity()..addAll(
         compiler.backend.constants.compiledConstants);
     newConstants.removeAll(_compiledConstants);
 
     if (!newConstants.isEmpty) {
-      _ensureNeedsComputed();
+      _ensureAllNeededEntitiesComputed();
       List<ConstantValue> constants =
           emitter.outputConstantLists[compiler.deferredLoadTask.mainOutputUnit];
       if (constants != null) {
         for (ConstantValue constant in constants) {
           if (newConstants.contains(constant)) {
             jsAst.Statement constantInitializer = emitter.oldEmitter
                 .buildConstantInitializer(constant).toStatement();
             updates.add(constantInitializer);
           }
         }
       }
     }
 
     updates.add(js.statement(r'''
-if (self.$dart_unsafe_eval.pendingStubs) {
-  self.$dart_unsafe_eval.pendingStubs.map(function(e) { return e(); });
-  self.$dart_unsafe_eval.pendingStubs = void 0;
+if (#helper.pendingStubs) {
+  #helper.pendingStubs.map(function(e) { return e(); });
+  #helper.pendingStubs = void 0;
 }
-'''));
+''', {'helper': helper}));
 
     if (updates.length == 1) {
       return prettyPrintJs(updates.single);
     } else {
       return prettyPrintJs(js.statement('{#}', [updates]));
     }
   }
 
   jsAst.Expression invokeDefineClass(ClassElementX cls) {
     String name = namer.getNameOfClass(cls);
     var descriptor = js('Object.create(null)');
     return js(
         r'''
 (new Function(
     "$collectedClasses", "$desc",
-    self.$dart_unsafe_eval.defineClass(#, #) +"\n;return " + #))({#: #})''',
-        [js.string(name), js.stringArray(computeFields(cls)),
-         js.string(name),
-         js.string(name), descriptor]);
+    #helper.defineClass(#name, #computeFields) +"\n;return " + #name))(
+        {#name: #descriptor})''',
+        {'helper': helper,
+         'name': js.string(name),
+         'computeFields': js.stringArray(computeFields(cls)),
+         'descriptor': descriptor});
   }
 
   jsAst.Node computeMethodUpdateJs(Element element) {
     MemberInfo info = containerBuilder.analyzeMemberMethod(element);
     if (info == null) {
       compiler.internalError(element, '${element.runtimeType}');
     }
     ClassBuilder builder = new ClassBuilder(element, namer);
     containerBuilder.addMemberMethodFromInfo(info, builder);
     jsAst.Node partialDescriptor =
-        builder.toObjectInitializer(omitClassDescriptor: true);
+        builder.toObjectInitializer(emitClassDescriptor: false);
 
     String name = info.name;
     jsAst.Node function = info.code;
     bool isStatic = !element.isInstanceMember;
 
     /// Either a global object (non-instance members) or a prototype (instance
     /// members).
     jsAst.Node holder;
 
     if (element.isInstanceMember) {
       holder = js('#.prototype', emitter.classAccess(element.enclosingClass));
     } else {
       holder = js('#', namer.globalObjectFor(element));
     }
 
     jsAst.Expression globalFunctionsAccess =
         emitter.generateEmbeddedGlobalAccess(embeddedNames.GLOBAL_FUNCTIONS);
 
     return js.statement(
-        r'self.$dart_unsafe_eval.addMethod(#, #, #, #, #)',
-        [partialDescriptor, js.string(name), holder,
+        r'#.addMethod(#, #, #, #, #)',
+        [helper, partialDescriptor, js.string(name), holder,
          new jsAst.LiteralBool(isStatic), globalFunctionsAccess]);
   }
 
   List<jsAst.Statement> computeFieldUpdateJs(FieldElementX element) {
     if (element.isInstanceMember) {
       // Any initializers are inlined in factory methods, and the field is
       // declared by adding its class to [_classesWithSchemaChanges].
       return const <jsAst.Statement>[];
     }
     // A static (or top-level) field.
@@ skipping 27 matching lines @@
     // TODO(ahe): Call a method in the compiler to obtain this name.
     String callPrefix = namer.callPrefix;
     int parameterCount = element.functionSignature.parameterCount;
     return '$callPrefix\$$parameterCount';
   }
 
   List<String> computeFields(ClassElement cls) {
     return new EmitterHelper(compiler).computeFields(cls);
   }
 
-  void _ensureNeedsComputed() {
+  void _ensureAllNeededEntitiesComputed() {
     if (_hasComputedNeeds) return;
     emitter.computeAllNeededEntities();
     _hasComputedNeeds = true;
   }
 }
 
 /// Represents an update (aka patch) of [before] to [after]. We use the word
 /// "update" to avoid confusion with the compiler feature of "patch" methods.
 abstract class Update {
   final Compiler compiler;
@@ skipping 436 matching lines @@
 
   JavaScriptBackend get backend => compiler.backend;
 
   Namer get namer => backend.namer;
 
   CodeEmitterTask get emitter => backend.emitter;
 
   ContainerBuilder get containerBuilder => emitter.oldEmitter.containerBuilder;
 
   EnqueueTask get enqueuer => compiler.enqueuer;
+
+  jsAst.Expression get helper => namer.accessIncrementalHelper;
 }
 
 class EmitterHelper extends JsFeatures {
   final Compiler compiler;
 
   EmitterHelper(this.compiler);
 
   ClassEmitter get classEmitter => backend.emitter.oldEmitter.classEmitter;
 
   List<String> computeFields(ClassElement cls) {
     // TODO(ahe): Rewrite for new emitter.
     ClassBuilder builder = new ClassBuilder(cls, namer);
     classEmitter.emitFields(cls, builder);
     return builder.fields;
   }
 }
 
 // TODO(ahe): Remove this method.
 NO_WARN(x) => x;