Revert "Support runtime check of function types."

sdk/lib/_internal/compiler/implementation/ssa/builder.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 ssa;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 1153 matching lines @@
     }
 
     FunctionSignature signature = function.computeSignature(compiler);
     signature.orderedForEachParameter((Element parameter) {
       HInstruction argument = compiledArguments[argumentIndex++];
       newLocalsHandler.updateLocal(parameter, argument);
     });
 
     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);
       });
     }
     assert(argumentIndex == compiledArguments.length);
 
     // TODO(kasperl): Bad smell. We shouldn't be constructing elements here.
     returnElement = new ElementX(const SourceString("result"),
                                  ElementKind.VARIABLE,
@@ skipping 144 matching lines @@
                                                           compiledArguments));
       if (!succeeded) {
         // Non-matching super and redirects are compile-time errors and thus
         // checked by the resolver.
         compiler.internalError(
             "Parameters and arguments didn't match for super/redirect call",
             element: constructor);
       }
 
       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].
         ClassElement subclass = inlinedFromElement.getEnclosingClass();
         InterfaceType supertype = subclass.supertype;
         Link<DartType> typeVariables = superclass.typeVariables;
         supertype.typeArguments.forEach((DartType argument) {
           localsHandler.updateLocal(typeVariables.head.element,
               analyzeTypeArgument(argument, callNode));
           typeVariables = typeVariables.tail;
@@ skipping 226 matching lines @@
         includeSuperAndInjectedMembers: true);
 
     InterfaceType type = classElement.computeType(compiler);
     HType ssaType = new HType.nonNullExact(type, compiler);
     HForeignNew newObject = new HForeignNew(classElement,
                                             ssaType,
                                             constructorArguments);
     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));
       });
       callSetRuntimeTypeInfo(classElement, rtiInputs, newObject);
     }
 
     // Generate calls to the constructor bodies.
     for (int index = constructors.length - 1; index >= 0; index--) {
       FunctionElement constructor = constructors[index];
@@ skipping 25 matching lines @@
         // If [parameter] is checked, we pass the already computed
         // boolean to the constructor body.
         if (elements.isParameterChecked(parameter)) {
           Element fieldCheck =
               parameterClosureData.parametersWithSentinel[parameter];
           bodyCallInputs.add(localsHandler.readLocal(fieldCheck));
         }
       });
 
       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) {
           bodyCallInputs.add(localsHandler.readLocal(argument.element));
         });
       }
 
       // If there are locals that escape (ie mutated in closures), we
       // pass the box to the constructor.
       ClosureScope scopeData = parameterClosureData.capturingScopes[node];
@@ skipping 83 matching lines @@
     localsHandler.startFunction(element, node);
     close(new HGoto()).addSuccessor(block);
 
     open(block);
 
     // Add the type parameters of the class as parameters of this method.  This
     // must be done before adding the normal parameters, because their types
     // 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;
       });
     }
 
     if (element is FunctionElement) {
       FunctionElement functionElement = element;
       FunctionSignature signature = functionElement.computeSignature(compiler);
       signature.orderedForEachParameter((Element parameterElement) {
@@ skipping 28 matching lines @@
     } else {
       // Otherwise it is a lazy initializer which does not have parameters.
       assert(element is VariableElement);
     }
   }
 
   HInstruction buildTypeConversion(HInstruction original,
                                    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);
      add(representations);
      return new HTypeConversion.withTypeRepresentation(type, kind, subtype,
           original, representations);
     } else if (type.kind == TypeKind.TYPE_VARIABLE) {
       HType subtype = original.instructionType;
       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);
     }
   }
 
   HInstruction potentiallyCheckType(HInstruction original, DartType type,
       { int kind: HTypeConversion.CHECKED_MODE_CHECK }) {
     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;
   }
 
   HGraph closeFunction() {
     // TODO(kasperl): Make this goto an implicit return.
     if (!isAborted()) closeAndGotoExit(new HGoto());
     graph.finalize();
     return graph;
   }
 
@@ skipping 625 matching lines @@
         Element capturedLocal = nestedClosureData.capturedFieldMapping[member];
         assert(capturedLocal != null);
         capturedVariables.add(localsHandler.readLocal(capturedLocal));
       }
     });
 
     HType type = new HType.nonNullExact(
         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) {
     assert(isReachable);
     visit(node.function);
     localsHandler.updateLocal(elements[node], pop());
   }
 
   visitIdentifier(Identifier node) {
     if (node.isThis()) {
@@ skipping 263 matching lines @@
           inputs.add(runtimeType);
         }));
       }
       String template = '[${templates.join(', ')}]';
       HInstruction representation =
         createForeign(template, backend.readableArrayType, inputs);
       return representation;
     }
   }
 
-  visitOperatorSend(Send node) {
+  visitOperatorSend(node) {
     Operator op = node.selector;
     if (const SourceString("[]") == op.source) {
       visitDynamicSend(node);
     } else if (const SourceString("&&") == op.source ||
                const SourceString("||") == op.source) {
       visitLogicalAndOr(node, op);
     } else if (const SourceString("!") == op.source) {
       visitLogicalNot(node);
     } else if (node.argumentsNode is Prefix) {
       visitUnary(node, op);
@@ skipping 16 matching lines @@
       var left = pop();
       visitBinary(left, op, right, elements.getSelector(node), node);
     }
   }
 
   void visitIsSend(Send node) {
     visit(node.receiver);
     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) {
         generateMalformedSubtypeError(node, expression, type, reasons);
       } else {
         generateRuntimeError(node, '$type is malformed: $reasons');
       }
     } else {
       HInstruction instruction = buildIsNode(node, type, expression);
       if (isNot) {
         add(instruction);
         instruction = new HNot(instruction);
       }
       push(instruction);
     }
   }
 
-  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];
       pushInvokeStatic(null, helper, inputs, HType.BOOLEAN);
       HInstruction call = pop();
       return new HIs(type, <HInstruction>[expression, call],
                      HIs.VARIABLE_CHECK);
     } else if (RuntimeTypes.hasTypeArguments(type)) {
       ClassElement element = type.element;
       Element helper = backend.getCheckSubtype();
@@ skipping 177 matching lines @@
       Element element = compiler.isolateHelperLibrary.find(
           const SourceString('_currentIsolate'));
       if (element == null) {
         compiler.cancel(
             'Isolate library and compiler mismatch', node: node);
       }
       pushInvokeStatic(null, element, [], HType.UNKNOWN);
     }
   }
 
-  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()) {
       // If the isolate library is not used, we just invoke the
       // closure.
       visit(link.tail.head);
       Selector selector = new Selector.callClosure(0);
       push(new HInvokeClosure(selector, <HInstruction>[pop()]));
     } else {
       // Call a helper method from the isolate library.
@@ skipping 91 matching lines @@
                       <HInstruction>[]));
   }
 
   visitForeignSend(Send node) {
     Selector selector = elements.getSelector(node);
     SourceString name = selector.name;
     if (name == const SourceString('JS')) {
       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')) {
       handleForeignDartClosureToJs(node, 'DART_CLOSURE_TO_JS');
     } else if (name == const SourceString('RAW_DART_FUNCTION_REF')) {
       handleForeignRawFunctionRef(node, 'RAW_DART_FUNCTION_REF');
     } else if (name == const SourceString('JS_SET_CURRENT_ISOLATE')) {
       handleForeignSetCurrentIsolate(node);
     } else if (name == const SourceString('JS_CREATE_ISOLATE')) {
       handleForeignCreateIsolate(node);
     } else if (name == const SourceString('JS_OPERATOR_IS_PREFIX')) {
       stack.add(addConstantString(node, backend.namer.operatorIsPrefix()));
     } 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')) {
       Element element = compiler.findHelper(
           const SourceString('JavaScriptIndexingBehavior'));
       stack.add(addConstantString(node, backend.namer.operatorIs(element)));
     } else if (name == const SourceString('JS_CURRENT_ISOLATE')) {
       handleForeignJsCurrentIsolate(node);
     } else {
       throw "Unknown foreign: ${selector}";
@@ skipping 96 matching lines @@
   /**
    * Generate code to extract the type arguments from the object, substitute
    * them as an instance of the type we are testing against (if necessary), and
    * extract the type argument by the index of the variable in the list of type
    * variables for that class.
    */
   HInstruction readTypeVariable(ClassElement cls,
                                 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();
   }
 
   /**
    * Helper to create an instruction that gets the value of a type variable.
    */
   HInstruction addTypeVariableReference(TypeVariableType type) {
     Element member = currentElement;
@@ skipping 61 matching lines @@
     });
 
     HInstruction result = createForeign(template, backend.stringType, inputs);
     add(result);
     return result;
   }
 
   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) {
         inputs.add(analyzeTypeArgument(argument, currentNode));
       });
       callSetRuntimeTypeInfo(type.element, inputs, newObject);
     }
   }
 
   void callSetRuntimeTypeInfo(ClassElement element,
                               List<HInstruction> rtiInputs,
                               HInstruction newObject) {
-    if (!backend.classNeedsRti(element) || element.typeVariables.isEmpty) {
+    if (!backend.needsRti(element) || element.typeVariables.isEmpty) {
       return;
     }
 
     HInstruction typeInfo = buildLiteralList(rtiInputs);
     add(typeInfo);
 
     // Set the runtime type information on the object.
     Element typeInfoSetterElement = backend.getSetRuntimeTypeInfo();
     pushInvokeStatic(
         null,
@@ skipping 77 matching lines @@
     if (!succeeded) {
       generateWrongArgumentCountError(send, constructor, send.arguments);
       return;
     }
 
     ClassElement cls = constructor.getEnclosingClass();
     if (cls.isAbstract(compiler) && constructor.isGenerativeConstructor()) {
       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));
         typeVariable = typeVariable.tail;
       });
       // Also add null to non-provided type variables to call the
       // constructor with the right number of arguments.
       while (!typeVariable.isEmpty) {
         inputs.add(graph.addConstantNull(compiler));
         typeVariable = typeVariable.tail;
       }
     }
 
     if (constructor.isFactoryConstructor() && !type.typeArguments.isEmpty) {
       compiler.enqueuer.codegen.registerFactoryWithTypeArguments(elements);
     }
     HType elementType = computeType(constructor);
     pushInvokeStatic(node, constructor, inputs, elementType);
     HInstruction newInstance = stack.last;
 
     // The List constructor forwards to a Dart static method that does
     // 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);
     }
 
     // Finally, if we called a redirecting factory constructor, check the type.
     if (isRedirected) {
       HInstruction checked = potentiallyCheckType(newInstance, expectedType);
       if (checked != newInstance) {
         pop();
         stack.add(checked);
       }
@@ skipping 1933 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }