Move computation of method flags into model.

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 49 matching lines @@
 
 import 'package:compiler/src/js_emitter/js_emitter.dart' show
     ClassBuilder,
     ClassEmitter,
     CodeEmitterTask,
     ContainerBuilder,
     MemberInfo,
     computeMixinClass;
 
 import 'package:compiler/src/js_emitter/model.dart' show
-    Class;
+    Class,
+    Member;
 import 'package:compiler/src/js_emitter/program_builder.dart' show
     ProgramBuilder;
 
 import 'package:_internal/compiler/js_lib/shared/embedded_names.dart'
     as embeddedNames;
 
 import 'package:compiler/src/js_backend/js_backend.dart' show
     JavaScriptBackend,
     Namer;
 
@@ skipping 843 matching lines @@
 (new Function(
     "$collectedClasses", "$desc",
     this.defineClass(#name, #computeFields) +"\n;return " + #name))(
         {#name: #descriptor})''',
         {'name': js.string(name),
          'computeFields': js.stringArray(computeFields(cls)),
          'descriptor': descriptor});
   }
 
   jsAst.Node computeMethodUpdateJs(Element element) {
-    MemberInfo info = containerBuilder.analyzeMemberMethod(element);
-    if (info == null) {
+    Member member = programBuilder.buildMethodForTry(element);
+    if (member == null) {
       compiler.internalError(element, '${element.runtimeType}');
     }
     ClassBuilder builder = new ClassBuilder(element, namer);
-    containerBuilder.addMemberMethodFromInfo(info, builder);
+    containerBuilder.addMemberMethod(member, builder);
     jsAst.Node partialDescriptor =
         builder.toObjectInitializer(emitClassDescriptor: false);
 
-    String name = info.name;
-    jsAst.Node function = info.code;
+    String name = member.name;
+    jsAst.Node function = member.code;
     bool isStatic = !element.isInstanceMember;
 
     /// Either a global object (non-instance members) or a prototype (instance
     /// members).
     jsAst.Node holder;
 
     if (element.isInstanceMember) {
       holder = emitter.prototypeAccess(element.enclosingClass);
     } else {
       holder = js('#', namer.globalObjectFor(element));
@@ skipping 502 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;
+
+  ProgramBuilder get programBuilder {

[floitsch, 2015/01/28 16:10:39]

I wouldn't do this. The calls to the programBuilder are relatively hackish and I
prefer keeping the full code together.

[herhut, 2015/01/29 10:24:21]

Done.

+    return new ProgramBuilder(compiler, namer, emitter);
+  }
 }
 
 class EmitterHelper extends JsFeatures {
   final Compiler compiler;
 
   EmitterHelper(this.compiler);
 
   ClassEmitter get classEmitter => backend.emitter.oldEmitter.classEmitter;
 
   List<String> computeFields(ClassElement classElement) {
-    Class cls = new ProgramBuilder(compiler, namer, emitter)
-        .buildClassWithFieldsForTry(classElement);
+    Class cls = programBuilder.buildClassWithFieldsForTry(classElement);
     // TODO(ahe): Rewrite for new emitter.
     ClassBuilder builder = new ClassBuilder(classElement, namer);
     classEmitter.emitFields(cls, builder);
     return builder.fields;
   }
 }
 
 // TODO(ahe): Remove this method.
 NO_WARN(x) => x;