Revert "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 511 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.isTypeTest) {
-      DartType type = elements.getType(node.typeAnnotationFromIsCheckOrCast);
-      analyzeType(type);
-    } else if (node.isTypeCast) {
-      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);
-  }
 
-  void analyzeTypeVariables(DartType type) {
-    type.forEachTypeVariable((TypeVariableType typeVariable) {
-      useLocal(typeVariable.element);
-      // Field initializers are inlined and access the type variable as
-      // normal parameters.
-      if (!outermostElement.isField()) {
-        registerNeedsThis();
+    void analyzeTypeVariables(DartType type) {
+      if (type is TypeVariableType) {
+        useLocal(type.element);
+        // Field initializers are inlined and access the type variable as
+        // normal parameters.
+        if (!outermostElement.isField()) {
+          registerNeedsThis();
+        }
+      } else if (type is InterfaceType) {
+        InterfaceType ifcType = type;
+        for (DartType argument in ifcType.typeArguments) {
+          analyzeTypeVariables(argument);
+        }
       }
-    });
-  }
+    }
 
-  void analyzeType(DartType type) {
-    // TODO(johnniwinther): Find out why this can be null.
-    if (type == null) return;
     if (outermostElement.isMember() &&
-        compiler.backend.classNeedsRti(outermostElement.getEnclosingClass())) {
-      if (outermostElement.isConstructor() ||
-          outermostElement.isField()) {
+        compiler.backend.needsRti(outermostElement.getEnclosingClass())) {
+      if (outermostElement.isConstructor() || outermostElement.isField()) {
         analyzeTypeVariables(type);
       } else if (outermostElement.isInstanceMember()) {
         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 138 matching lines @@
       }
       // If we are inside a named closure we have to declare ourselve. For
       // simplicity we declare the local even if the closure does not have a
       // name.
       // It will simply not be used.
       if (insideClosure) {
         declareLocal(element);
       }
 
       if (currentElement.isFactoryConstructor() &&
-          compiler.backend.classNeedsRti(currentElement.enclosingElement)) {
+          compiler.backend.needsRti(currentElement.enclosingElement)) {
         // Declare the type parameters in the scope. Generative
         // constructors just use 'this'.
         ClassElement cls = currentElement.enclosingElement;
         cls.typeVariables.forEach((TypeVariableType typeVariable) {
           declareLocal(typeVariable.element);
         });
       }
 
-      DartType type = element.computeType(compiler);
       // Compute the function type and check for type variables in return or
       // parameter types.
-      if (type.containsTypeVariables) {
-        registerNeedsThis();
-      }
-      // Ensure that closure that need runtime type information has access to
-      // this of the enclosing class.
-      if (element is FunctionElement &&
-          closureData.thisElement != null &&
-          type.containsTypeVariables &&
-          compiler.backend.methodNeedsRti(element)) {
+      if (element.computeType(compiler).containsTypeVariables) {
         registerNeedsThis();
       }
 
       visitChildren();
     });
 
 
     ClosureClassMap savedClosureData = closureData;
     bool savedInsideClosure = insideClosure;
 
@@ skipping 40 matching lines @@
   }
 
   visitTryStatement(TryStatement node) {
     // TODO(ngeoffray): implement finer grain state.
     bool oldInTryStatement = inTryStatement;
     inTryStatement = true;
     node.visitChildren(this);
     inTryStatement = oldInTryStatement;
   }
 }