Cleanup generation of type argument representations.

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 2570 matching lines @@
     return new HForeign(new LiteralDartString(code), type, inputs);
   }
 
   HInstruction getRuntimeTypeInfo(HInstruction target) {
     pushInvokeHelper1(backend.getGetRuntimeTypeInfo(), target, HType.UNKNOWN);
     return pop();
   }
 
   // TODO(karlklose): change construction of the representations to be GVN'able
   // (dartbug.com/7182).
-  List<HInstruction> buildTypeArgumentRepresentations(DartType type) {
+  HInstruction buildTypeArgumentRepresentations(DartType type) {
     // Compute the representation of the type arguments, including access
     // to the runtime type information for type variables as instructions.
-    HInstruction representations;
     if (type.kind == TypeKind.TYPE_VARIABLE) {
-      return <HInstruction>[addTypeVariableReference(type)];
+      return new HLiteralList(<HInstruction>[addTypeVariableReference(type)]);
     } else {
       assert(type.element.isClass());
-      List<HInstruction> arguments = <HInstruction>[];
       InterfaceType interface = type;
+      List<HInstruction> inputs = <HInstruction>[];
+      bool first = true;
+      List<String> templates = <String>[];
       for (DartType argument in interface.typeArguments) {
-        List<HInstruction> inputs = <HInstruction>[];
-        String template = rti.getTypeRepresentation(argument, (variable) {
+        templates.add(rti.getTypeRepresentation(argument, (variable) {
           HInstruction runtimeType = addTypeVariableReference(variable);
           inputs.add(runtimeType);
-        });
-        HInstruction representation =
-            createForeign(template, HType.READABLE_ARRAY, inputs);
-        add(representation);
-        arguments.add(representation);
+        }));
       }

[ngeoffray, 2013/03/07 10:13:57]

Move the code below in the else part. Or just remove the 'else'.

[karlklose, 2013/03/07 11:22:18]

It is in the else part.

-      return arguments;
+      String template = '[${templates.join(', ')}]';
+      HInstruction representation =
+        createForeign(template, HType.READABLE_ARRAY, inputs);
+      return representation;
     }
   }
 
   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);
@@ skipping 19 matching lines @@
         if (compiler.enableTypeAssertions) {
           generateMalformedSubtypeError(node, expression, type, reasons);
         } else {
           generateRuntimeError(node, '$type is malformed: $reasons');
         }
         return;
       }
 
       HInstruction instruction;
       if (type.kind == TypeKind.TYPE_VARIABLE) {
-        List<HInstruction> representations =
-            buildTypeArgumentRepresentations(type);
-        assert(representations.length == 1);
         HInstruction runtimeType = addTypeVariableReference(type);
         Element helper = backend.getGetObjectIsSubtype();
         HInstruction helperCall = new HStatic(helper);
         add(helperCall);
         List<HInstruction> inputs = <HInstruction>[helperCall, expression,
                                                    runtimeType];
         instruction = new HInvokeStatic(inputs, HType.BOOLEAN);
         add(instruction);
         compiler.enqueuer.codegen.registerIsCheck(type);
 
       } else if (RuntimeTypeInformation.hasTypeArguments(type)) {
 
         void argumentsCheck() {
           HInstruction typeInfo = getRuntimeTypeInfo(expression);
           Element helper = backend.getCheckArguments();
           HInstruction helperCall = new HStatic(helper);
           add(helperCall);
-          List<HInstruction> representations =
+          HInstruction representations =
               buildTypeArgumentRepresentations(type);
+          add(representations);
           Element element = type.element;
           String substitution = backend.namer.substitutionName(element);
           if (backend.emitter.nativeEmitter.requiresNativeIsCheck(element)) {
             substitution = '$substitution()';
           }
           HInstruction fieldGet =
               createForeign('#.$substitution', HType.UNKNOWN, [expression]);
-          HInstruction representationList = new HLiteralList(representations);
           add(fieldGet);
-          add(representationList);
           List<HInstruction> inputs = <HInstruction>[helperCall,
                                                      fieldGet,
                                                      typeInfo,
-                                                     representationList];
+                                                     representations];
           push(new HInvokeStatic(inputs, HType.UNKNOWN));
         }
 
         void classCheck() { push(new HIs(type, <HInstruction>[expression])); }
 
         SsaBranchBuilder branchBuilder = new SsaBranchBuilder(this, node);
         branchBuilder.handleLogicalAndOr(classCheck, argumentsCheck,
                                          isAnd: true);
         instruction = pop();
       } else {
@@ skipping 2397 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;
   }
 }