Substitution added to DartType

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 1947 matching lines @@
 
       startBlock.setBlockFlow(info, current);
       loopInfo.loopBlockInformation = info;
     } else {
       // There is no back edge for the loop, so we turn the code into:
       // if (condition) {
       //   body;
       // } else {
       //   // We always create an empty else block to avoid critical edges.
       // }
-      // 
+      //
       // If there is any break in the body, we attach a synthetic
       // label to the if.
       HBasicBlock elseBlock = addNewBlock();
       open(elseBlock);
       close(new HGoto());
       endLoop(conditionBlock, null, jumpHandler, savedLocals);
 
       // [endLoop] will not create an exit block if there are no
       // breaks.
       if (current == null) open(addNewBlock());
@@ skipping 1133 matching lines @@
      *   Var             #                       [getRuntimeType(this).Var]
      *   C<int, D<Var>>  'C<int, D<' + # + '>>'  [getRuntimeType(this).Var]
      */
     void buildTypeString(DartType type, {isInQuotes: false}) {
       if (type is TypeVariableType) {
         addTypeVariableReference(type);
         template.add(isInQuotes ? "' + # +'" : "#");
       } else if (type is InterfaceType) {
         bool isFirstVariable = true;
         InterfaceType interfaceType = type;
-        bool hasTypeArguments = !interfaceType.arguments.isEmpty;
+        bool hasTypeArguments = !interfaceType.typeArguments.isEmpty;
         if (!isInQuotes) template.add("'");
         template.add(backend.namer.getName(type.element));
         if (hasTypeArguments) {
           template.add("<");
-          for (DartType argument in interfaceType.arguments) {
+          for (DartType argument in interfaceType.typeArguments) {
             if (!isFirstVariable) {
               template.add(", ");
             } else {
               isFirstVariable = false;
             }
             buildTypeString(argument, isInQuotes: true);
           }
           template.add(">");
         }
         if (!isInQuotes) template.add("'");
@@ skipping 12 matching lines @@
             inputs);
     add(result);
     return result;
   }
 
   void handleListConstructor(InterfaceType type,
                              Node currentNode,
                              HInstruction newObject) {
     if (!compiler.world.needsRti(type.element)) return;
     List<HInstruction> inputs = <HInstruction>[];
-    type.arguments.forEach((DartType argument) {
+    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 (!compiler.world.needsRti(element) || element.typeVariables.isEmpty) {
       return;
@@ skipping 51 matching lines @@
       generateWrongArgumentCountError(node, constructor, node.arguments);
       return;
     }
 
     if (constructor.getEnclosingClass().isAbstract(compiler) &&
         constructor.isGenerativeConstructor()) {
       generateAbstractClassInstantiationError(node, type.name.slowToString());
       return;
     }
     if (compiler.world.needsRti(constructor.enclosingElement)) {
-      if (!type.arguments.isEmpty) {
-        type.arguments.forEach((DartType argument) {
+      if (!type.typeArguments.isEmpty) {
+        type.typeArguments.forEach((DartType argument) {
           inputs.add(analyzeTypeArgument(argument, node));
         });
       }
     }
 
     HType elementType = computeType(constructor);
     HInstruction newInstance = new HInvokeStatic(inputs, elementType);
     pushWithPosition(newInstance, node);
 
     // The List constructor forwards to a Dart static method that does
@@ skipping 1646 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;
   }
 }