Add NativeEnqueuer to work with the Enqueuer.

sdk/lib/_internal/compiler/implementation/enqueue.dart

 // Copyright (c) 2012, 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.
 
 part of dart2js;
 
 class EnqueueTask extends CompilerTask {
   final Enqueuer codegen;
   final Enqueuer resolution;
 
@@ skipping 23 matching lines @@
    * Map from declaration elements to the [TreeElements] object holding the
    * resolution mapping for the element implementation.
    *
    * Invariant: Key elements are declaration elements.
    */
   final Map<Element, TreeElements> resolvedElements;
 
   bool queueIsClosed = false;
   EnqueueTask task;
 
+  native.NativeEnqueuer nativeEnqueuer;  // Set by compiler.
+
   Enqueuer(this.name, this.compiler,
            ItemCompilationContext itemCompilationContextCreator())
     : this.itemCompilationContextCreator = itemCompilationContextCreator,
       instanceMembersByName = new Map<String, Link<Element>>(),
       seenClasses = new Set<ClassElement>(),
       universe = new Universe(),
       queue = new Queue<WorkItem>(),
       resolvedElements = new Map<Element, TreeElements>();
 
   bool get isResolutionQueue => identical(compiler.enqueuer.resolution, this);
@@ skipping 55 matching lines @@
       compiler.enabledInvokeOn = true;
     }
 
     // Enable isolate support if we start using something from the
     // isolate library.
     LibraryElement library = element.getLibrary();
     if (!compiler.hasIsolateSupport()
         && library.uri.toString() == 'dart:isolate') {
       compiler.enableIsolateSupport(library);
     }
+
+    nativeEnqueuer.registerElement(element);
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [element] must be a declaration element.
    */
   void eagerRecompile(Element element) {
     assert(invariant(element, element.isDeclaration));
     universe.generatedCode.remove(element);
@@ skipping 32 matching lines @@
   }
 
   /**
    * Documentation wanted -- johnniwinther
    */
   void processInstantiatedClassMember(ClassElement cls, Element member) {
     assert(invariant(member, member.isDeclaration));
     if (universe.generatedCode.containsKey(member)) return;
     if (resolvedElements[member] != null) return;
     if (!member.isInstanceMember()) return;
-    if (member.isField()) return;
+    if (member.isField()) {
+      // Native fields need to go into instanceMembersByName as they are virtual
+      // instantiation points and escape points.
+      if (!member.enclosingElement.isNative()) return;
+    }
 
     String memberName = member.name.slowToString();
     Link<Element> members = instanceMembersByName.putIfAbsent(
         memberName, () => const Link<Element>());
     instanceMembersByName[memberName] = members.prepend(member);
 
     if (member.kind == ElementKind.FUNCTION) {
       if (member.name == Compiler.NO_SUCH_METHOD) {
         compiler.enableNoSuchMethod(member);
       }
@@ skipping 11 matching lines @@
       }
     } else if (member.kind == ElementKind.GETTER) {
       if (universe.hasInvokedGetter(member, compiler)) {
         return addToWorkList(member);
       }
       // We don't know what selectors the returned closure accepts. If
       // the set contains any selector we have to assume that it matches.
       if (universe.hasInvocation(member, compiler)) {
         return addToWorkList(member);
       }
-    } else if (identical(member.kind, ElementKind.SETTER)) {
+    } else if (member.kind == ElementKind.SETTER) {
       if (universe.hasInvokedSetter(member, compiler)) {
         return addToWorkList(member);
       }
+    } else if (member.kind == ElementKind.FIELD &&
+               member.enclosingElement.isNative()) {
+      if (universe.hasInvokedGetter(member, compiler) ||
+          universe.hasInvocation(member, compiler)) {
+        nativeEnqueuer.registerFieldLoad(member);
+      }
+      if (universe.hasInvokedSetter(member, compiler)) {
+        nativeEnqueuer.registerFieldStore(member);
+      }
     }
   }
 
   void onRegisterInstantiatedClass(ClassElement cls) {
     task.measure(() {
       // The class must be resolved to compute the set of all
       // supertypes.
       cls.ensureResolved(compiler);
 
       for (Link<DartType> supertypes = cls.allSupertypesAndSelf;
@@ skipping 69 matching lines @@
       for (; !members.isEmpty; members = members.tail) {
         if (!f(members.head)) remaining.addLast(members.head);
       }
       instanceMembersByName[memberName] = remaining.toLink();
     }
   }
 
   void handleUnseenSelector(SourceString methodName, Selector selector) {
     processInstanceMembers(methodName, (Element member) {
       if (selector.applies(member, compiler)) {
-        addToWorkList(member);
+        // print('unseen $selector add $member   ${member.kind}');

[ngeoffray, 2012/11/15 12:49:57]

Remove print

+        if (member.isField() && member.enclosingElement.isNative()) {
+          if (selector.isGetter() || selector.isCall()) {
+            nativeEnqueuer.registerFieldLoad(member);
+            // We have to also handle storing to the field because we only get
+            // one look at each member and there might be a store we have not
+            // seen yet.
+            // TODO(sra): Process fields for storing separately.
+            nativeEnqueuer.registerFieldStore(member);
+          } else {
+            nativeEnqueuer.registerFieldStore(member);
+            // We have to also handle loading from the field because we only get
+            // one look at each member and there might be a load we have not
+            // seen yet.
+            // TODO(sra): Process fields for storing separately.
+            nativeEnqueuer.registerFieldLoad(member);
+          }
+        } else {
+          addToWorkList(member);
+        }
         return true;
       }
       return false;
     });
   }
 
   /**
    * Documentation wanted -- johnniwinther
    *
    * Invariant: [element] must be a declaration element.
@@ skipping 53 matching lines @@
   }
 
   void forEach(f(WorkItem work)) {
     while (!queue.isEmpty) {
       f(queue.removeLast()); // TODO(kasperl): Why isn't this removeFirst?
     }
   }
 
   String toString() => 'Enqueuer($name)';
 
+  void logSummary(log(message)) {
+    log(isResolutionQueue
+        ? 'Resolved ${resolvedElements.length} elements.'
+        : 'Compiled ${universe.generatedCode.length} methods.');
+    nativeEnqueuer.logSummary(log);
+  }
+
   registerUsedSelector(Selector selector) {
     Element interceptor = compiler.backend.getInterceptor(selector);
     if (interceptor != null) {
       registerStaticUse(interceptor);
     }
   }
 }