Revert "Support runtime check of function types."

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

Index: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
diff --git a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
index a6a779ad4be04cacabe5f64f1e547eada7db41b8..bb882abea5719854f6ecb4cb32cc5555afb04663 100644
--- a/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
+++ b/sdk/lib/_internal/compiler/implementation/ssa/builder.dart
@@ -1171,7 +1171,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
 
     ClassElement enclosing = function.getEnclosingClass();
     if ((function.isConstructor() || function.isGenerativeConstructorBody())
-        && backend.classNeedsRti(enclosing)) {
+        && backend.needsRti(enclosing)) {
       enclosing.typeVariables.forEach((TypeVariableType typeVariable) {
         HInstruction argument = compiledArguments[argumentIndex++];
         newLocalsHandler.updateLocal(typeVariable.element, argument);
@@ -1336,7 +1336,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       }
 
       ClassElement superclass = constructor.getEnclosingClass();
-      if (backend.classNeedsRti(superclass)) {
+      if (backend.needsRti(superclass)) {
         // If [superclass] needs RTI, we have to give a value to its
         // type parameters. Those values are in the [supertype]
         // declaration of [subclass].
@@ -1583,7 +1583,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     add(newObject);
 
     // Create the runtime type information, if needed.
-    if (backend.classNeedsRti(classElement)) {
+    if (backend.needsRti(classElement)) {
       List<HInstruction> rtiInputs = <HInstruction>[];
       classElement.typeVariables.forEach((TypeVariableType typeVariable) {
         rtiInputs.add(localsHandler.readLocal(typeVariable.element));
@@ -1629,7 +1629,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       });
 
       ClassElement currentClass = constructor.getEnclosingClass();
-      if (backend.classNeedsRti(currentClass)) {
+      if (backend.needsRti(currentClass)) {
         // If [currentClass] needs RTI, we add the type variables as
         // parameters of the generative constructor body.
         currentClass.typeVariables.forEach((DartType argument) {
@@ -1733,7 +1733,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     // may contain references to type variables.
     var enclosing = element.enclosingElement;
     if ((element.isConstructor() || element.isGenerativeConstructorBody())
-        && backend.classNeedsRti(enclosing)) {
+        && backend.needsRti(enclosing)) {
       enclosing.typeVariables.forEach((TypeVariableType typeVariable) {
         HParameterValue param = addParameter(typeVariable.element);
         localsHandler.directLocals[typeVariable.element] = param;
@@ -1782,7 +1782,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
                                    DartType type,
                                    int kind) {
     if (type == null) return original;
-    type = type.unalias(compiler);
     if (type.kind == TypeKind.INTERFACE && !type.isMalformed && !type.isRaw) {
      HType subtype = new HType.subtype(type, compiler);
      HInstruction representations = buildTypeArgumentRepresentations(type);
@@ -1794,24 +1793,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       HInstruction typeVariable = addTypeVariableReference(type);
       return new HTypeConversion.withTypeRepresentation(type, kind, subtype,
           original, typeVariable);
-    } else if (type.kind == TypeKind.FUNCTION) {
-      HType subtype = original.instructionType;
-      if (type.containsTypeVariables) {
-        bool contextIsTypeArguments = false;
-        HInstruction context;
-        if (currentElement.isInstanceMember()) {
-          context = localsHandler.readThis();
-        } else {
-          ClassElement contextClass = Types.getClassContext(type);
-          context = buildTypeVariableList(contextClass);
-          add(context);
-          contextIsTypeArguments = true;
-        }
-        return new HTypeConversion.withContext(type, kind, subtype,
-            original, context, contextIsTypeArguments: contextIsTypeArguments);
-      } else {
-        return new HTypeConversion(type, kind, subtype, original);
-      }
     } else {
       return original.convertType(compiler, type, kind);
     }
@@ -1822,7 +1803,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     if (!compiler.enableTypeAssertions) return original;
     HInstruction other = buildTypeConversion(original, type, kind);
     if (other != original) add(other);
-    compiler.enqueuer.codegen.registerIsCheck(type, work.resolutionTree);
     return other;
   }
 
@@ -2468,12 +2448,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
         compiler.functionClass.computeType(compiler),
         compiler);
     push(new HForeignNew(closureClassElement, type, capturedVariables));
-
-    Element methodElement = nestedClosureData.closureElement;
-    if (compiler.backend.methodNeedsRti(methodElement)) {
-      compiler.backend.registerGenericClosure(
-          methodElement, compiler.enqueuer.codegen, work.resolutionTree);
-    }
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
@@ -2757,7 +2731,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     }
   }
 
-  visitOperatorSend(Send node) {
+  visitOperatorSend(node) {
     Operator op = node.selector;
     if (const SourceString("[]") == op.source) {
       visitDynamicSend(node);
@@ -2794,7 +2768,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     HInstruction expression = pop();
     bool isNot = node.isIsNotCheck;
     DartType type = elements.getType(node.typeAnnotationFromIsCheckOrCast);
-    type = type.unalias(compiler);
     if (type.isMalformed) {
       String reasons = Types.fetchReasonsFromMalformedType(type);
       if (compiler.enableTypeAssertions) {
@@ -2812,57 +2785,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     }
   }
 
-  HLiteralList buildTypeVariableList(ClassElement contextClass) {
-    List<HInstruction> inputs = <HInstruction>[];
-    for (Link<DartType> link = contextClass.typeVariables;
-        !link.isEmpty;
-        link = link.tail) {
-      inputs.add(addTypeVariableReference(link.head));
-    }
-    return buildLiteralList(inputs);
-  }
-
   HInstruction buildIsNode(Node node, DartType type, HInstruction expression) {
-    type = type.unalias(compiler);
-    if (type.kind == TypeKind.FUNCTION) {
-      Element checkFunctionSubtype = backend.getCheckFunctionSubtype();
-
-      HInstruction signatureName = graph.addConstantString(
-          new DartString.literal(backend.namer.getFunctionTypeName(type)),
-          node, compiler);
-
-      HInstruction contextName;
-      HInstruction context;
-      HInstruction typeArguments;
-      if (type.containsTypeVariables) {
-        ClassElement contextClass = Types.getClassContext(type);
-        contextName = graph.addConstantString(
-            new DartString.literal(backend.namer.getName(contextClass)),
-            node, compiler);
-        if (currentElement.isInstanceMember()) {
-          context = localsHandler.readThis();
-          typeArguments = graph.addConstantNull(compiler);
-        } else {
-          context = graph.addConstantNull(compiler);
-          typeArguments = buildTypeVariableList(contextClass);
-          add(typeArguments);
-        }
-      } else {
-        contextName = graph.addConstantNull(compiler);
-        context = graph.addConstantNull(compiler);
-        typeArguments = graph.addConstantNull(compiler);
-      }
-
-      List<HInstruction> inputs = <HInstruction>[expression,
-                                                 signatureName,
-                                                 contextName,
-                                                 context,
-                                                 typeArguments];
-      pushInvokeStatic(node, checkFunctionSubtype, inputs, HType.BOOLEAN);
-      HInstruction call = pop();
-      return new HIs(type, <HInstruction>[expression, call],
-          HIs.COMPOUND_CHECK);
-    } else if (type.kind == TypeKind.TYPE_VARIABLE) {
+    if (type.kind == TypeKind.TYPE_VARIABLE) {
       HInstruction runtimeType = addTypeVariableReference(type);
       Element helper = backend.getCheckSubtypeOfRuntimeType();
       List<HInstruction> inputs = <HInstruction>[expression, runtimeType];
@@ -3060,18 +2984,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     }
   }
 
-  void handleForeignJsSetupObject(Send node) {
-    if (!node.arguments.isEmpty) {
-      compiler.cancel(
-          'Too many arguments to JS_GLOBAL_OBJECT', node: node);
-    }
-
-    String name = backend.namer.GLOBAL_OBJECT;
-    push(new HForeign(new js.LiteralString(name),
-                      HType.UNKNOWN,
-                      <HInstruction>[]));
-  }
-
   void handleForeignJsCallInIsolate(Send node) {
     Link<Node> link = node.arguments;
     if (!compiler.hasIsolateSupport()) {
@@ -3183,8 +3095,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       handleForeignJs(node);
     } else if (name == const SourceString('JS_CURRENT_ISOLATE_CONTEXT')) {
       handleForeignJsCurrentIsolateContext(node);
-    } else if (name == const SourceString('JS_GLOBAL_OBJECT')) {
-      handleForeignJsSetupObject(node);
     } else if (name == const SourceString('JS_CALL_IN_ISOLATE')) {
       handleForeignJsCallInIsolate(node);
     } else if (name == const SourceString('DART_CLOSURE_TO_JS')) {
@@ -3200,33 +3110,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     } else if (name == const SourceString('JS_OBJECT_CLASS_NAME')) {
       String name = backend.namer.getRuntimeTypeName(compiler.objectClass);
       stack.add(addConstantString(node, name));
-    } else if (name == const SourceString('JS_FUNCTION_CLASS_NAME')) {
-      String name = backend.namer.getRuntimeTypeName(compiler.functionClass);
-      stack.add(addConstantString(node, name));
     } else if (name == const SourceString('JS_OPERATOR_AS_PREFIX')) {
       stack.add(addConstantString(node, backend.namer.operatorAsPrefix()));
-    } else if (name == const SourceString('JS_SIGNATURE_NAME')) {
-      stack.add(addConstantString(node, backend.namer.operatorSignature()));
-    } else if (name == const SourceString('JS_FUNCTION_TYPE_TAG')) {
-      stack.add(addConstantString(node, backend.namer.functionTypeTag()));
-    } else if (name == const SourceString('JS_FUNCTION_TYPE_VOID_RETURN_TAG')) {
-      stack.add(addConstantString(node,
-                                  backend.namer.functionTypeVoidReturnTag()));
-    } else if (name == const SourceString('JS_FUNCTION_TYPE_RETURN_TYPE_TAG')) {
-      stack.add(addConstantString(node,
-                                  backend.namer.functionTypeReturnTypeTag()));
-    } else if (name ==
-               const SourceString('JS_FUNCTION_TYPE_REQUIRED_PARAMETERS_TAG')) {
-      stack.add(addConstantString(node,
-          backend.namer.functionTypeRequiredParametersTag()));
-    } else if (name ==
-               const SourceString('JS_FUNCTION_TYPE_OPTIONAL_PARAMETERS_TAG')) {
-      stack.add(addConstantString(node,
-          backend.namer.functionTypeOptionalParametersTag()));
-    } else if (name ==
-               const SourceString('JS_FUNCTION_TYPE_NAMED_PARAMETERS_TAG')) {
-      stack.add(addConstantString(node,
-          backend.namer.functionTypeNamedParametersTag()));
     } else if (name == const SourceString('JS_DART_OBJECT_CONSTRUCTOR')) {
       handleForeignDartObjectJsConstructorFunction(node);
     } else if (name == const SourceString('JS_IS_INDEXABLE_FIELD_NAME')) {
@@ -3343,14 +3228,17 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
                                 TypeVariableElement variable) {
     assert(currentElement.isInstanceMember());
     int index = RuntimeTypes.getTypeVariableIndex(variable);
-    String substitutionNameString = backend.namer.getName(cls);
+    String substitutionNameString = backend.namer.substitutionName(cls);
     HInstruction substitutionName = graph.addConstantString(
         new LiteralDartString(substitutionNameString), null, compiler);
     HInstruction target = localsHandler.readThis();
+    HInstruction substitution = createForeign('#[#]', HType.UNKNOWN,
+        <HInstruction>[target, substitutionName]);
+    add(substitution);
     pushInvokeStatic(null,
                      backend.getGetRuntimeTypeArgument(),
                      [target,
-                      substitutionName,
+                      substitution,
                       graph.addConstantInt(index, compiler)],
                       HType.UNKNOWN);
     return pop();
@@ -3432,7 +3320,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
   void handleListConstructor(InterfaceType type,
                              Node currentNode,
                              HInstruction newObject) {
-    if (!backend.classNeedsRti(type.element)) return;
+    if (!backend.needsRti(type.element)) return;
     if (!type.isRaw) {
       List<HInstruction> inputs = <HInstruction>[];
       type.typeArguments.forEach((DartType argument) {
@@ -3445,7 +3333,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
   void callSetRuntimeTypeInfo(ClassElement element,
                               List<HInstruction> rtiInputs,
                               HInstruction newObject) {
-    if (!backend.classNeedsRti(element) || element.typeVariables.isEmpty) {
+    if (!backend.needsRti(element) || element.typeVariables.isEmpty) {
       return;
     }
 
@@ -3543,7 +3431,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
       generateAbstractClassInstantiationError(send, cls.name.slowToString());
       return;
     }
-    if (backend.classNeedsRti(cls)) {
+    if (backend.needsRti(cls)) {
       Link<DartType> typeVariable = cls.typeVariables;
       type.typeArguments.forEach((DartType argument) {
         inputs.add(analyzeTypeArgument(argument, send));
@@ -3568,7 +3456,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
     // not know about the type argument. Therefore we special case
     // this constructor to have the setRuntimeTypeInfo called where
     // the 'new' is done.
-    if (isListConstructor && backend.classNeedsRti(compiler.listClass)) {
+    if (isListConstructor && backend.needsRti(compiler.listClass)) {
       handleListConstructor(type, send, newInstance);
     }