Change how runtime type information is being set in the backend.

lib/compiler/implementation/ssa/codegen.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.
 
 class SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
   SsaCodeGeneratorTask(JavaScriptBackend backend)
       : this.backend = backend,
@@ skipping 30 matching lines @@
       });
       compiler.tracer.traceGraph("codegen", graph);
       Map<Element, String> parameterNames = getParameterNames(work);
       parameterNames.forEach((element, name) {
         compiler.enqueuer.codegen.addToWorkList(element);
       });
       List<js.Parameter> parameters = <js.Parameter>[];
       parameterNames.forEach((element, name) {
         parameters.add(new js.Parameter(name));
       });
+      addTypeVariables(work.element, parameters, parameterNames);
       String parametersString = Strings.join(parameterNames.getValues(), ", ");
       SsaOptimizedCodeGenerator codegen = new SsaOptimizedCodeGenerator(
           backend, work, parameters, parameterNames);
       codegen.visitGraph(graph);
 
       FunctionElement element = work.element;
       js.Block body;
       ClassElement enclosingClass = element.getEnclosingClass();
       if (element.isInstanceMember()
           && enclosingClass.isNative()
           && native.isOverriddenMethod(
               element, enclosingClass, nativeEmitter)) {
         // Record that this method is overridden. In case of optional
         // arguments, the emitter will generate stubs to handle them,
         // and needs to know if the method is overridden.
         nativeEmitter.overriddenMethods.add(element);
         StringBuffer buffer = new StringBuffer();
         String codeString = prettyPrint(codegen.body, work.element).toString();
         native.generateMethodWithPrototypeCheckForElement(
             compiler, buffer, element, codeString, parametersString);
         js.Node nativeCode = new js.LiteralStatement(buffer.toString());
         body = new js.Block(<js.Statement>[nativeCode]);
       } else {
         body = codegen.body;
       }
       js.Fun fun = buildJavaScriptFunction(element, parameters, body);
       return prettyPrint(fun, work.element);
     });
   }
+  
+  void addTypeVariables(Element element,

[kasperl, 2012/08/28 09:14:15]

Shouldn't this be something like addTypeParameters?

[ngeoffray, 2012/08/28 10:39:45]

Done.

+                        List<js.Parameter> parameters,
+                        Map<Element, String> parameterNames) {
+    if (element.isFactoryConstructor() || element.isGenerativeConstructor()) {
+      ClassElement cls = element.enclosingElement;
+      cls.typeVariables.forEach((TypeVariableType typeVariable) {
+        String name = typeVariable.element.name.slowToString();
+        String prefix = '';
+        // Avoid collisions with real parameters of the method.
+        do {  
+          name = JsNames.getValid('$prefix$name');
+          prefix = '\$$prefix';
+        } while (parameterNames.containsValue(name));
+        parameterNames[typeVariable.element] = name;
+        parameters.add(new js.Parameter(name));
+      });
+    }
+  }
 
   CodeBuffer generateBailoutMethod(WorkItem work, HGraph graph) {
     return measure(() {
       compiler.tracer.traceGraph("codegen-bailout", graph);
 
       Map<Element, String> parameterNames = getParameterNames(work);
       List<js.Parameter> parameters = <js.Parameter>[];
       parameterNames.forEach((element, name) {
         parameters.add(new js.Parameter(name));
       });
+      addTypeVariables(work.element, parameters, parameterNames);
+
       SsaUnoptimizedCodeGenerator codegen = new SsaUnoptimizedCodeGenerator(
           backend, work, parameters, parameterNames);
       codegen.visitGraph(graph);
 
       js.Block body = new js.Block(<js.Statement>[]);
       if (codegen.setup != null) body.statements.add(codegen.setup);
       body.statements.add(codegen.body);
       js.Fun fun =
           buildJavaScriptFunction(work.element, codegen.newParameters, body);
       return prettyPrint(fun, work.element);
@@ skipping 2152 matching lines @@
       attachLocationToLast(node);
     } else if (types[input].canBePrimitive() || types[input].canBeNull()) {
       checkObject(input, '===');
       js.Expression objectTest = pop();
       checkType(input, element);
       push(new js.Binary('&&', objectTest, pop()), node);
     } else {
       checkType(input, element);
       attachLocationToLast(node);
     }
-    if (compiler.codegenWorld.rti.hasTypeArguments(type)) {
+    if (node.hasTypeInfo()) {
       InterfaceType interfaceType = type;
       ClassElement cls = type.element;
       Link<Type> arguments = interfaceType.arguments;
       js.Expression result = pop();
-      checkObject(node.typeInfoCall, '===');
-      result = new js.Binary('&&', result, pop());
       for (TypeVariableType typeVariable in cls.typeVariables) {
         use(node.typeInfoCall);
         // TODO(johnniwinther): Retrieve the type name properly and not through
         // [toString]. Note: Two cases below [typeVariable] and
         // [arguments.head].
         js.PropertyAccess field =
             new js.PropertyAccess.field(pop(), typeVariable.toString());
         js.Expression genericName = new js.LiteralString("'${arguments.head}'");
         js.Binary eqTest = new js.Binary('===', field, genericName);
         result = new js.Binary('&&', result, eqTest);
@@ skipping 626 matching lines @@
   if (leftType.canBeNull() && rightType.canBeNull()) {
     if (left.isConstantNull() || right.isConstantNull() ||
         (leftType.isPrimitive() && leftType == rightType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }