Support runtime check of function types.

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 ResolutionEnqueuer resolution;
   final CodegenEnqueuer codegen;
 
@@ skipping 50 matching lines @@
 
     if (!addElementToWorkList(element, elements)) return;
 
     // Enable runtime type support if we discover a getter called runtimeType.
     // We have to enable runtime type before hitting the codegen, so
     // that constructors know whether they need to generate code for
     // runtime type.
     if (element.isGetter() && element.name == Compiler.RUNTIME_TYPE) {
       compiler.enabledRuntimeType = true;
       // TODO(ahe): Record precise dependency here.
-      compiler.backend.registerRuntimeType(compiler.globalDependencies);
+      compiler.backend.registerRuntimeType(this, compiler.globalDependencies);
     } else if (element == compiler.functionApplyMethod) {
       compiler.enabledFunctionApply = true;
     } else if (element == compiler.invokeOnMethod) {
       compiler.enabledInvokeOn = true;
     }
 
     nativeEnqueuer.registerElement(element);
   }
 
   /**
@@ skipping 61 matching lines @@
       // enclosing class, since the metadata has not been parsed yet.
       if (!member.enclosingElement.isNative()) return;
     }
 
     String memberName = member.name.slowToString();
 
     if (member.kind == ElementKind.FUNCTION) {
       if (member.name == Compiler.NO_SUCH_METHOD) {
         enableNoSuchMethod(member);
       }
+      if (member.name == Compiler.CALL_OPERATOR_NAME) {
+        if (!cls.typeVariables.isEmpty) {

[karlklose, 2013/03/22 13:17:46]

use '&&'.  Consider storing '!cls.typeVariables.isEmpty' in a local. 

[Johnni Winther, 2013/06/21 12:19:14]

Done. '!cls.typeVariables.isEmpty' is only used once now.

+          registerGenericCallMethod(member, compiler.globalDependencies);
+        }
+      }
       if (universe.hasInvocation(member, compiler)) {
         return addToWorkList(member);
       }
       // If there is a property access with the same name as a method we
       // need to emit the method.
       if (universe.hasInvokedGetter(member, compiler)) {
+        if (!cls.typeVariables.isEmpty) {
+          registerGenericClosure(member, compiler.globalDependencies);
+        }
         // We will emit a closure, so make sure the closure class is
         // generated.
         compiler.closureClass.ensureResolved(compiler);
         registerInstantiatedClass(compiler.closureClass,
                                   // Precise dependency is not important here.
                                   compiler.globalDependencies);
         return addToWorkList(member);
       }
     } else if (member.kind == ElementKind.GETTER) {
       if (universe.hasInvokedGetter(member, compiler)) {
@@ skipping 95 matching lines @@
   void registerInvokedSetter(SourceString setterName, Selector selector) {
     task.measure(() {
       registerNewSelector(setterName, selector, universe.invokedSetters);
     });
   }
 
   processInstanceMembers(SourceString n, bool f(Element e)) {
     String memberName = n.slowToString();
     Link<Element> members = instanceMembersByName[memberName];
     if (members != null) {
+      instanceMembersByName[memberName] = const Link<Element>();

[karlklose, 2013/03/22 13:17:46]

Could you add a comment why you do this?

[Johnni Winther, 2013/06/21 12:19:14]

Done.

       LinkBuilder<Element> remaining = new LinkBuilder<Element>();
       for (; !members.isEmpty; members = members.tail) {
         if (!f(members.head)) remaining.addLast(members.head);
       }
-      instanceMembersByName[memberName] = remaining.toLink();
+      instanceMembersByName[memberName] =
+          remaining.toLink(instanceMembersByName[memberName]);
     }
   }
 
   void handleUnseenSelector(SourceString methodName, Selector selector) {
     processInstanceMembers(methodName, (Element member) {
       if (selector.appliesUnnamed(member, compiler)) {
+        if (member.isFunction() && selector.isGetter()) {
+          if (!member.getEnclosingClass().typeVariables.isEmpty) {
+            registerGenericClosure(member, compiler.globalDependencies);
+          }
+        }
         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);
@@ skipping 75 matching lines @@
 
   void registerFieldGetter(Element element) {
     universe.fieldGetters.add(element);
   }
 
   void registerFieldSetter(Element element) {
     universe.fieldSetters.add(element);
   }
 
   void registerIsCheck(DartType type, TreeElements elements) {
+    type = type.unalias(compiler);
     // Even in checked mode, type annotations for return type and argument
     // types do not imply type checks, so there should never be a check
     // against the type variable of a typedef.
     assert(type.kind != TypeKind.TYPE_VARIABLE ||
            !type.element.enclosingElement.isTypedef());
     universe.isChecks.add(type);
     compiler.backend.registerIsCheck(type, this, elements);
   }
 
   void registerAsCheck(DartType type, TreeElements elements) {
     registerIsCheck(type, elements);
     compiler.backend.registerAsCheck(type, elements);
   }
 
+  void registerGenericCallMethod(Element element, TreeElements elements) {
+    compiler.backend.registerGenericCallMethod(element, this, elements);
+    universe.genericCallMethods.add(element);
+  }
+
+  void registerGenericClosure(Element element, TreeElements elements) {
+    compiler.backend.registerGenericClosure(element, this, elements);
+    universe.closurizedGenericMembers.add(element);
+  }
+
   void forEach(f(WorkItem work));
 
   void logSummary(log(message)) {
     _logSpecificSummary(log);
     nativeEnqueuer.logSummary(log);
   }
 
   /// Log summary specific to the concrete enqueuer.
   void _logSpecificSummary(log(message));
 
@@ skipping 158 matching lines @@
     while(!queue.isEmpty) {
       // TODO(johnniwinther): Find an optimal process order for codegen.
       f(queue.removeLast());
     }
   }
 
   void _logSpecificSummary(log(message)) {
     log('Compiled ${generatedCode.length} methods.');
   }
 }