Support runtime check of function types.

sdk/lib/_internal/compiler/implementation/closure.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.
 
 library closureToClassMapper;
 
 import "elements/elements.dart";
 import "dart2jslib.dart";
 import "dart_types.dart";
 import "scanner/scannerlib.dart" show Token;
@@ skipping 505 matching lines @@
       ClosureClassMap cached = closureMappingCache[function];
       if (!cached.parametersWithSentinel.containsKey(parameter)) {
         SourceString parameterName = parameter.name;
         String name = '${parameterName.slowToString()}_check';
         Element newElement = new CheckVariableElement(new SourceString(name),
                                                       parameter,
                                                       enclosing);
         useLocal(newElement);
         cached.parametersWithSentinel[parameter] = newElement;
       }
+    } else if (node.isOperator) {
+      String operatorString = node.selector.asOperator().source.stringValue;
+      if (operatorString == 'is' || operatorString == 'as') {

[karlklose, 2013/06/20 07:32:55]

Use predicates on the node?

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

Done.

+        DartType type = elements.getType(node.arguments.head);
+        analyzeType(type);
+      }
     }
     node.visitChildren(this);
   }
 
   visitSendSet(SendSet node) {
     Element element = elements[node];
     if (Elements.isLocal(element)) {
       mutatedVariables.add(element);
     }
     if (Elements.isLocal(element) &&
         element.computeType(compiler).containsTypeVariables) {
       registerNeedsThis();
     }
     super.visitSendSet(node);
   }
 
   visitNewExpression(NewExpression node) {
     DartType type = elements.getType(node);
+    analyzeType(type);
+    node.visitChildren(this);
+  }
 
-    bool hasTypeVariable(DartType type) {
-      if (type is TypeVariableType) {
-        return true;
-      } else if (type is InterfaceType) {
-        InterfaceType ifcType = type;
-        for (DartType argument in ifcType.typeArguments) {
-          if (hasTypeVariable(argument)) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
+  void analyzeTypeVariables(DartType type) {
+    type.forEachTypeVariable((TypeVariableType typeVariable) {
+      useLocal(typeVariable.element);
+    });
+  }
 
-    void analyzeTypeVariables(DartType type) {
-      if (type is TypeVariableType) {
-        useLocal(type.element);
-      } else if (type is InterfaceType) {
-        InterfaceType ifcType = type;
-        for (DartType argument in ifcType.typeArguments) {
-          analyzeTypeVariables(argument);
-        }
-      }
-    }
-
+  void analyzeType(DartType type) {
+    if (type == null) return;
     if (outermostElement.isMember() &&
         compiler.backend.needsRti(outermostElement.getEnclosingClass())) {
-      if (outermostElement.isConstructor() || outermostElement.isField()) {
+      if (outermostElement.isConstructor() ||
+          outermostElement.isField()) {
         analyzeTypeVariables(type);
       } else if (outermostElement.isInstanceMember()) {
-        if (hasTypeVariable(type)) {
+        if (type.containsTypeVariables) {
           registerNeedsThis();
         }
       }
     }
-
-    node.visitChildren(this);
   }
 
   // If variables that are declared in the [node] scope are captured and need
   // to be boxed create a box-element and update the [capturingScopes] in the
   // current [closureData].
   // The boxed variables are updated in the [capturedVariableMapping].
   void attachCapturedScopeVariables(Node node) {
     Element box = null;
     Map<Element, Element> scopeMapping = new Map<Element, Element>();
     for (Element element in scopeVariables) {
@@ skipping 152 matching lines @@
         cls.typeVariables.forEach((TypeVariableType typeVariable) {
           declareLocal(typeVariable.element);
         });
       }
 
       // Compute the function type and check for type variables in return or
       // parameter types.
       if (element.computeType(compiler).containsTypeVariables) {
         registerNeedsThis();
       }
+      // Ensure that closure that need runtime type information has access to
+      // this of the enclosing class.
+      if (closureData.thisElement != null &&
+          compiler.backend.methodNeedsRti(element)) {
+        registerNeedsThis();
+      }
 
       visitChildren();
     });
 
 
     ClosureClassMap savedClosureData = closureData;
     bool savedInsideClosure = insideClosure;
 
     // Restore old values.
     insideClosure = oldInsideClosure;
@@ skipping 38 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }