dart2js cps: Streamline expressions and primitives.

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 209 matching lines @@
   }
 
   visitBranch(cps_ir.Branch node) {
     String dummy = names.name(node);
     String condition = visit(node.condition);
     String trueCont = formatReference(node.trueContinuation);
     String falseCont = formatReference(node.falseContinuation);
     printStmt(dummy, "Branch $condition ($trueCont, $falseCont)");
   }
 
-  visitSetMutableVariable(cps_ir.SetMutableVariable node) {
-    String dummy = names.name(node);
+  visitSetMutable(cps_ir.SetMutable node) {
     String variable = names.name(node.variable.definition);
     String value = formatReference(node.value);
-    printStmt(dummy, 'SetMutableVariable $variable := $value');
-    visit(node.body);
+    return 'SetMutable $variable := $value';
   }
 
   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);
     }
   }
@@ skipping 14 matching lines @@
 
   visitContinuation(cps_ir.Continuation node) {
     return "Continuation ${names.name(node)}";
   }
 
   visitIsTrue(cps_ir.IsTrue node) {
     return "IsTrue(${names.name(node.value.definition)})";
   }
 
   visitSetField(cps_ir.SetField node) {
-    String dummy = names.name(node);
     String object = formatReference(node.object);
     String field = node.field.name;
     String value = formatReference(node.value);
-    printStmt(dummy, 'SetField $object.$field = $value');
-    visit(node.body);
+    return 'SetField $object.$field = $value';
   }
 
   visitGetField(cps_ir.GetField node) {
     String object = formatReference(node.object);
     String field = node.field.name;
     return 'GetField($object.$field)';
   }
 
   visitGetStatic(cps_ir.GetStatic node) {
     String element = node.element.name;
     return 'GetStatic($element)';
   }
 
   visitSetStatic(cps_ir.SetStatic node) {
-    String dummy = names.name(node);
     String element = node.element.name;
     String value = formatReference(node.value);
-    printStmt(dummy, 'SetStatic $element = $value');
-    visit(node.body);
+    return 'SetStatic $element = $value';
   }
 
   visitGetLazyStatic(cps_ir.GetLazyStatic node) {
     String dummy = names.name(node);
     String kont = formatReference(node.continuation);
     printStmt(dummy, "GetLazyStatic $kont");
   }
 
   visitCreateBox(cps_ir.CreateBox node) {
     return 'CreateBox';
   }
 
   visitCreateInstance(cps_ir.CreateInstance node) {
     String className = node.classElement.name;
     String arguments = node.arguments.map(formatReference).join(', ');
     String typeInformation =
         node.typeInformation.map(formatReference).join(', ');
     return 'CreateInstance $className ($arguments) <$typeInformation>';
   }
 
   visitInterceptor(cps_ir.Interceptor node) {
     return "Interceptor(${formatReference(node.input)})";
   }
 
   visitCreateFunction(cps_ir.CreateFunction node) {
     return "CreateFunction ${node.definition.element.name}";
   }
 
-  visitGetMutableVariable(cps_ir.GetMutableVariable node) {
+  visitGetMutable(cps_ir.GetMutable node) {
     String variable = names.name(node.variable.definition);
-    return 'GetMutableVariable $variable';
+    return 'GetMutable $variable';
   }
 
   visitReadTypeVariable(cps_ir.ReadTypeVariable node) {
     return "ReadTypeVariable ${node.variable.element} "
         "${formatReference(node.target)}";
   }
 
   visitReifyRuntimeType(cps_ir.ReifyRuntimeType node) {
     return "ReifyRuntimeType ${formatReference(node.value)}";
   }
@@ skipping 180 matching lines @@
 
   visitThrow(cps_ir.Throw exp) {
   }
 
   visitRethrow(cps_ir.Rethrow exp) {
   }
 
   visitUnreachable(cps_ir.Unreachable node) {
   }
 
-  visitSetMutableVariable(cps_ir.SetMutableVariable exp) {
-    visit(exp.body);
-  }
-
-  visitSetField(cps_ir.SetField exp) {
-    visit(exp.body);
-  }
-
-  visitSetStatic(cps_ir.SetStatic exp) {
-    visit(exp.body);
-  }
-
   visitGetLazyStatic(cps_ir.GetLazyStatic exp) {
     addEdgeToContinuation(exp.continuation);
   }
 
   visitBranch(cps_ir.Branch exp) {
     cps_ir.Continuation trueTarget = exp.trueContinuation.definition;
     if (!trueTarget.isReturnContinuation) {
       currentBlock.addEdgeTo(getBlock(trueTarget));
     }
     cps_ir.Continuation falseTarget = exp.falseContinuation.definition;
@@ skipping 28 matching lines @@
   }
 
   visitConstant(cps_ir.Constant node) {
     unexpectedNode(node);
   }
 
   visitCreateFunction(cps_ir.CreateFunction node) {
     unexpectedNode(node);
   }
 
-  visitGetMutableVariable(cps_ir.GetMutableVariable node) {
+  visitGetMutable(cps_ir.GetMutable node) {
     unexpectedNode(node);
   }
 
   visitParameter(cps_ir.Parameter node) {
     unexpectedNode(node);
   }
 
   visitMutableVariable(cps_ir.MutableVariable node) {
     unexpectedNode(node);
   }
@@ skipping 55 matching lines @@
   }
 
   visitGetIndex(cps_ir.GetIndex node) {
     unexpectedNode(node);
   }
 
   visitSetIndex(cps_ir.SetIndex node) {
     unexpectedNode(node);
   }
 
+  visitSetMutable(cps_ir.SetMutable node) {
+    unexpectedNode(node);
+  }
+
+  visitSetField(cps_ir.SetField node) {
+    unexpectedNode(node);
+  }
+
+  visitSetStatic(cps_ir.SetStatic node) {
+    unexpectedNode(node);
+  }
+
   @override
   visitForeignCode(cps_ir.ForeignCode node) {
     if (node.continuation != null) {
       addEdgeToContinuation(node.continuation);
     }
   }
 }