More kernel-ification of type variables passed around constructors.

pkg/compiler/lib/src/ssa/builder_kernel.dart

 // Copyright (c) 2016, 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.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../closure.dart';
 import '../common.dart';
 import '../common/codegen.dart' show CodegenRegistry, CodegenWorkItem;
 import '../common/names.dart';
@@ skipping 206 matching lines @@
       return typeBuilder.potentiallyCheckOrTrustType(
           value, compiler.commonElements.boolType,
           kind: HTypeConversion.BOOLEAN_CONVERSION_CHECK);
     }
     HInstruction result = new HBoolify(value, commonMasks.boolType);
     add(result);
     return result;
   }
 
   void _addClassTypeVariablesIfNeeded(ir.Member constructor) {
-    var enclosing = astAdapter.getElement(constructor).enclosingElement;
-    if (backend.classNeedsRti(enclosing)) {
-      enclosing.typeVariables.forEach((TypeVariableType typeVariable) {
+    var enclosing = constructor.enclosingClass;
+    if (backend.classNeedsRti(astAdapter.getElement(enclosing))) {
+      enclosing.typeParameters.forEach((ir.TypeParameter typeParameter) {
+        var typeParamElement = astAdapter.getElement(typeParameter);
         HParameterValue param =
-            addParameter(typeVariable.element, commonMasks.nonNullType);
+            addParameter(typeParamElement, commonMasks.nonNullType);
+        var dart_type = astAdapter.getDartType(typeParameter.bound);
+        // This is a little bit wacky (and n^2) until we make the localsHandler
+        // take Kernel DartTypes instead of just the AST DartTypes.
+        var typeVariableType = (astAdapter.getElement(constructor))
+            .enclosingElement
+            .typeVariables
+            .firstWhere((TypeVariableType i) => i.name == typeParameter.name);
         localsHandler.directLocals[
-            localsHandler.getTypeVariableAsLocal(typeVariable)] = param;
+            localsHandler.getTypeVariableAsLocal(typeVariableType)] = param;
       });
     }
   }
 
   /// Builds generative constructors.
   ///
   /// Generative constructors are built in two stages.
   ///
   /// First, the field values for every instance field for every class in the
   /// class hierarchy are collected. Then, create a function body that sets
@@ skipping 1713 matching lines @@
     isExpression.operand.accept(this);
     HInstruction expression = pop();
     push(buildIsNode(isExpression, isExpression.type, expression));
   }
 
   HInstruction buildIsNode(
       ir.Node node, ir.DartType type, HInstruction expression) {
     // Note: The call to "unalias" this type like in the original SSA builder is
     // unnecessary in kernel because Kernel has no notion of typedef.
     // TODO(efortuna): Add test for this.
-    DartType typeValue = localsHandler.substInContext(
-        astAdapter.getDartType(type));
+    DartType typeValue =
+        localsHandler.substInContext(astAdapter.getDartType(type));
     if (type is ir.InvalidType) {
       generateTypeError(node, (typeValue.element as ErroneousElement).message);
       return new HIs.compound(
           typeValue, expression, pop(), commonMasks.boolType);
     }
 
     if (type is ir.FunctionType) {
       List arguments = [buildFunctionType(typeValue), expression];
       _pushDynamicInvocation(node, null, arguments,
           selector: new Selector.call(
@@ skipping 351 matching lines @@
     kernelBuilder.open(exitBlock);
     enterBlock.setBlockFlow(
         new HTryBlockInformation(
             kernelBuilder.wrapStatementGraph(bodyGraph),
             exception,
             kernelBuilder.wrapStatementGraph(catchGraph),
             kernelBuilder.wrapStatementGraph(finallyGraph)),
         exitBlock);
   }
 }