Re-apply "support for typedef in checked mode" and fix the checked mode failures on drt by not shar…

sdk/lib/_internal/compiler/implementation/js_backend/emitter.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 js_backend;
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
@@ skipping 1094 matching lines @@
                           new js.VariableUse('receiver')
                               .dot(name)
                               .callWith(arguments))]));
 
       CodeBuffer code = new CodeBuffer();
       code.add(js.prettyPrint(function, compiler));
       defineInstanceMember(name, code);
     }
   }
 
+  Iterable<Element> getTypedefChecksOn(DartType type) {
+    return checkedTypedefs.filter((TypedefElement typedef) {
+      FunctionType typedefType =
+          typedef.computeType(compiler).unalias(compiler);
+      return compiler.types.isSubtype(type, typedefType);
+    });
+  }
+
   /**
    * Generate "is tests" for [cls]: itself, and the "is tests" for the
    * classes it implements. We don't need to add the "is tests" of the
    * super class because they will be inherited at runtime.
    */
   void generateIsTestsOn(ClassElement cls,
                          void emitIsTest(Element element)) {
     if (checkedClasses.contains(cls)) {
       emitIsTest(cls);
     }
 
     Set<Element> generated = new Set<Element>();
     // A class that defines a [:call:] method implicitly implements
     // [Function] and needs checks for all typedefs that are used in is-checks.
     if (checkedClasses.contains(compiler.functionClass) ||
         !checkedTypedefs.isEmpty) {
       FunctionElement call = cls.lookupLocalMember(Compiler.CALL_OPERATOR_NAME);
       if (call == null) {
         // If [cls] is a closure, it has a synthetic call operator method.
         call = cls.lookupBackendMember(Compiler.CALL_OPERATOR_NAME);
       }
       if (call != null) {
         generateInterfacesIsTests(compiler.functionClass,
                                   emitIsTest,
                                   generated);
-        FunctionType callType = call.computeType(compiler);
-        for (TypedefElement typedef in checkedTypedefs) {
-          FunctionType typedefType =
-              typedef.computeType(compiler).unalias(compiler);
-          if (compiler.types.isSubtype(callType, typedefType)) {
-            emitIsTest(typedef);
-          }
-        }
+        getTypedefChecksOn(call.computeType(compiler)).forEach(emitIsTest);
       }
     }
     for (DartType interfaceType in cls.interfaces) {
       generateInterfacesIsTests(interfaceType.element, emitIsTest, generated);
     }
   }
 
   /**
    * Generate "is tests" where [cls] is being implemented.
    */
@@ skipping 176 matching lines @@
       String invocationName = namer.instanceMethodName(callElement);
       String fieldAccess = '$isolateProperties.$staticName';
       buffer.add("$fieldAccess.$invocationName$_=$_$fieldAccess$N");
       addParameterStubs(callElement, (String name, CodeBuffer value) {
         buffer.add('$fieldAccess.$name$_=$_$value$N');
       });
       // If a static function is used as a closure we need to add its name
       // in case it is used in spawnFunction.
       String fieldName = namer.STATIC_CLOSURE_NAME_NAME;
       buffer.add('$fieldAccess.$fieldName$_=$_"$staticName"$N');
+      getTypedefChecksOn(element.computeType(compiler)).forEach(
+        (Element typedef) {
+          String operator = namer.operatorIs(typedef);
+          buffer.add('$fieldAccess.$operator$_=${_}true$N');
+        }
+      );
     }
   }
 
   void emitBoundClosureClassHeader(String mangledName,
                                    String superName,
                                    List<String> fieldNames,
                                    CodeBuffer buffer) {
     buffer.add('$classesCollector.$mangledName$_=$_'
                '{"":"$superName;${Strings.join(fieldNames,',')}",');
   }
@@ skipping 41 matching lines @@
       extraArg = 'receiver';
     } else {
       cache = boundClosureCache;
     }
     List<String> fieldNames = compiler.enableMinification
         ? inInterceptor ? const ['a', 'b', 'c']
                         : const ['a', 'b']
         : inInterceptor ? const ['self', 'target', 'receiver']
                         : const ['self', 'target'];
 
-    String closureClass = hasOptionalParameters ? null : cache[parameterCount];
+    Iterable<Element> typedefChecks =
+        getTypedefChecksOn(member.computeType(compiler));
+    bool hasTypedefChecks = typedefChecks.iterator().hasNext;

[floitsch, 2012/12/19 13:37:23]

For your information: this will become:
!typedefChecks.isEmpty;

(which imho is even nicer).

[ngeoffray, 2012/12/19 13:47:27]

I was actually looking for it :-)

+
+    bool canBeShared = !hasOptionalParameters && !hasTypedefChecks;
+
+    String closureClass = canBeShared ? cache[parameterCount] : null;
     if (closureClass == null) {
       // Either the class was not cached yet, or there are optional parameters.
       // Create a new closure class.
       SourceString name = const SourceString("BoundClosure");
       ClassElement closureClassElement = new ClosureClassElement(
           name, compiler, member, member.getCompilationUnit());
       String mangledName = namer.getName(closureClassElement);
       String superName = namer.getName(closureClassElement.superclass);
       needsClosureClass = true;
 
@@ skipping 31 matching lines @@
                               new js.This().dot(fieldNames[0]),
                               new js.This().dot(fieldNames[1]))
                           .callWith(arguments))]));
 
       boundClosureBuffer.add(
           '$_$invocationName:$_${js.prettyPrint(fun,compiler)}');
 
       addParameterStubs(callElement, (String stubName, CodeBuffer memberValue) {
         boundClosureBuffer.add(',\n$_$stubName:$_$memberValue');
       });
+
+      typedefChecks.forEach((Element typedef) {
+        String operator = namer.operatorIs(typedef);
+        boundClosureBuffer.add(',\n$_$operator$_:${_}true');
+      });
+
       boundClosureBuffer.add("$n}$N");
 
       closureClass = namer.isolateAccess(closureClassElement);
 
       // Cache it.
-      if (!hasOptionalParameters) {
+      if (canBeShared) {
         cache[parameterCount] = closureClass;
       }
     }
 
     // And finally the getter.
     String getterName = namer.getterName(member.getLibrary(), member.name);
     String targetName = namer.instanceMethodName(member);
 
     List<js.Parameter> parameters = <js.Parameter>[];
     List<js.Expression> arguments = <js.Expression>[];
@@ skipping 611 matching lines @@
 """;
 const String HOOKS_API_USAGE = """
 // The code supports the following hooks:
 // dartPrint(message)   - if this function is defined it is called
 //                        instead of the Dart [print] method.
 // dartMainRunner(main) - if this function is defined, the Dart [main]
 //                        method will not be invoked directly.
 //                        Instead, a closure that will invoke [main] is
 //                        passed to [dartMainRunner].
 """;