dart2js cps: Rewrite mutable variables to continuation parameters.

pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.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_nodes_sexpr;
 
 import '../constants/values.dart';
 import '../util/util.dart';
 import 'cps_ir_nodes.dart';
+import '../universe/universe.dart' show Selector, CallStructure;
 
 /// A [Decorator] is a function used by [SExpressionStringifier] to augment the
 /// output produced for a node or reference.  It can be provided to the
 /// constructor.
 typedef String Decorator(node, String s);
 
 /// Generate a Lisp-like S-expression representation of an IR node as a string.
 class SExpressionStringifier extends Indentation implements Visitor<String> {
   final _Namer namer = new _Namer();
 
@@ skipping 88 matching lines @@
     return '$indentation(LetHandler (($parameters)\n$handlerBody)\n$body)';
   }
 
   String visitLetMutable(LetMutable node) {
     String name = visit(node.variable);
     String value = access(node.value);
     String body = indentBlock(() => visit(node.body));
     return '$indentation(LetMutable ($name $value)\n$body)';
   }
 
-  String formatArguments(Invoke node) {
-    int positionalArgumentCount = node.selector.positionalArgumentCount;
+  String formatArguments(CallStructure call,
+                         List<Reference<Primitive>> arguments) {
+    int positionalArgumentCount = call.positionalArgumentCount;
     List<String> args = new List<String>();
-    args.addAll(
-        node.arguments.getRange(0, positionalArgumentCount).map(access));
-    for (int i = 0; i < node.selector.namedArgumentCount; ++i) {
-      String name = node.selector.namedArguments[i];
-      String arg = access(node.arguments[positionalArgumentCount + i]);
+    args.addAll(arguments.getRange(0, positionalArgumentCount).map(access));
+    List<String> argumentNames = call.getOrderedNamedArguments();
+    for (int i = 0; i < argumentNames.length; ++i) {
+      String name = argumentNames[i];
+      String arg = access(arguments[positionalArgumentCount + i]);
       args.add("($name: $arg)");
     }
     return '(${args.join(' ')})';
   }
 
   String visitInvokeStatic(InvokeStatic node) {
     String name = node.target.name;
     String cont = access(node.continuation);
-    String args = formatArguments(node);
+    String args = formatArguments(node.selector.callStructure, node.arguments);
     return '$indentation(InvokeStatic $name $args $cont)';
   }
 
   String visitInvokeMethod(InvokeMethod node) {
     String name = node.selector.name;
     String rcv = access(node.receiver);
     String cont = access(node.continuation);
-    String args = formatArguments(node);
+    String args = formatArguments(node.selector.callStructure, node.arguments);
     return '$indentation(InvokeMethod $rcv $name $args $cont)';
   }
 
   String visitInvokeMethodDirectly(InvokeMethodDirectly node) {
     String receiver = access(node.receiver);
     String name = node.selector.name;
     String cont = access(node.continuation);
-    String args = formatArguments(node);
+    String args = formatArguments(node.selector.callStructure, node.arguments);
     return '$indentation(InvokeMethodDirectly $receiver $name $args $cont)';
   }
 
   String visitInvokeConstructor(InvokeConstructor node) {
     String className;
     // TODO(karlklose): for illegal nodes constructed for tests or unresolved
     // constructor calls in the DartBackend, we get an element with no enclosing
     // class.  Clean this up by introducing a name field to the node and
     // removing [ErroneousElement]s from the IR.
     if (node.type != null) {
       className = node.type.toString();
     } else {
       className = node.target.enclosingClass.name;
     }
     String callName;
     if (node.target.name.isEmpty) {
       callName = '${className}';
     } else {
       callName = '${className}.${node.target.name}';
     }
     String cont = access(node.continuation);
-    String args = formatArguments(node);
+    String args = formatArguments(node.selector.callStructure, node.arguments);
     return '$indentation(InvokeConstructor $callName $args $cont)';
   }
 
   String visitInvokeContinuation(InvokeContinuation node) {
     String name = access(node.continuation);
     if (node.isRecursive) name = 'rec $name';
     String args = node.arguments.map(access).join(' ');
     return '$indentation(InvokeContinuation $name ($args))';
   }
 
@@ skipping 285 matching lines @@
   void setReturnContinuation(Continuation node) {
     assert(!_names.containsKey(node) || _names[node] == 'return');
     _names[node] = 'return';
   }
 
   String getName(Node node) {
     if (!_names.containsKey(node)) return 'MISSING_NAME';
     return _names[node];
   }
 }