dart2js cps: Store the TypeMask for each primitive in a field.

pkg/compiler/lib/src/cps_ir/cps_ir_tracer.dart

 // Copyright (c) 2014, 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.
 
 library dart2js.ir_tracer;
 
 import 'dart:async' show EventSink;
 import 'cps_ir_nodes.dart' as cps_ir hide Function;
 import '../tracer.dart';
 
@@ skipping 85 matching lines @@
 
   void printStmt(String resultVar, String contents) {
     int bci = 0;
     int uses = 0;
     addIndent();
     add("$bci $uses $resultVar $contents <|@\n");
   }
 
   visitLetPrim(cps_ir.LetPrim node) {
     String id = names.name(node.primitive);
-    printStmt(id, "LetPrim $id = ${formatPrimitive(node.primitive)}");
+    String primitive = visit(node.primitive);
+    printStmt(id, "LetPrim $id = $primitive [type=${node.primitive.type}]");
     visit(node.body);
   }
 
   visitLetCont(cps_ir.LetCont node) {
     if (IR_TRACE_LET_CONT) {
       String dummy = names.name(node);
 
       String nameContinuation(cps_ir.Continuation cont) {
         String name = names.name(cont);
         return cont.isRecursive ? '$name*' : name;
@@ skipping 91 matching lines @@
       entries.add("$key: $value");
     }
     return "LiteralMap (${entries.join(', ')})";
   }
 
   visitTypeCast(cps_ir.TypeCast node) {
     String dummy = names.name(node);
     String value = formatReference(node.value);
     String args = node.typeArguments.map(formatReference).join(', ');
     String kont = formatReference(node.continuation);
-    printStmt(dummy, "TypeCast ($value ${node.type} ($args)) $kont");
+    printStmt(dummy, "TypeCast ($value ${node.dartType} ($args)) $kont");
   }
 
   visitInvokeContinuation(cps_ir.InvokeContinuation node) {
     String dummy = names.name(node);
     String kont = formatReference(node.continuation);
     String args = node.arguments.map(formatReference).join(', ');
     printStmt(dummy, "InvokeContinuation $kont ($args)");
   }
 
   visitBranch(cps_ir.Branch node) {
@@ skipping 13 matching lines @@
 
   String formatReference(cps_ir.Reference ref) {
     cps_ir.Definition target = ref.definition;
     if (target is cps_ir.Continuation && target.isReturnContinuation) {
       return "return"; // Do not generate a name for the return continuation
     } else {
       return names.name(ref.definition);
     }
   }
 
-  String formatPrimitive(cps_ir.Primitive p) => visit(p);
-
   visitConstant(cps_ir.Constant node) {
     return "Constant ${node.value.toStructuredString()}";
   }
 
   visitParameter(cps_ir.Parameter node) {
     return "Parameter ${names.name(node)}";
   }
 
   visitMutableVariable(cps_ir.MutableVariable node) {
     return "MutableVariable ${names.name(node)}";
@@ skipping 73 matching lines @@
   }
 
   visitCreateInvocationMirror(cps_ir.CreateInvocationMirror node) {
     String args = node.arguments.map(formatReference).join(', ');
     return "CreateInvocationMirror(${node.selector.name}, $args)";
   }
 
   visitTypeTest(cps_ir.TypeTest node) {
     String value = formatReference(node.value);
     String args = node.typeArguments.map(formatReference).join(', ');
-    return "TypeTest ($value ${node.type} ($args))";
+    return "TypeTest ($value ${node.dartType} ($args))";
   }
 
   visitApplyBuiltinOperator(cps_ir.ApplyBuiltinOperator node) {
     String operator = node.operator.toString();
     String args = node.arguments.map(formatReference).join(', ');
     return 'ApplyBuiltinOperator $operator ($args)';
   }
 
   visitApplyBuiltinMethod(cps_ir.ApplyBuiltinMethod node) {
     String method = node.method.toString();
@@ skipping 315 matching lines @@
 
   @override
   visitAwait(cps_ir.Await node) {
     unexpectedNode(node);
   }
 
   visitRefinement(cps_ir.Refinement node) {
     unexpectedNode(node);
   }
 }