Index: pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.dart |
diff --git a/pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.dart b/pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.dart |
index fe3118feb68cc8fd01db647c32cbb79256726589..bf857f991c19fdf715b9b2cfebf96c2c1ac22610 100644 |
--- a/pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.dart |
+++ b/pkg/compiler/lib/src/cps_ir/cps_ir_nodes_sexpr.dart |
@@ -48,7 +48,6 @@ class SExpressionStringifier extends Indentation implements Visitor<String> { |
/// Main entry point for creating a [String] from a [Node]. All recursive |
/// calls must go through this method. |
String visit(Node node) { |
- if (node == null) return '**** NULL ****'; |
String s = node.accept(this); |
return decorator(node, s); |
} |
@@ -113,25 +112,20 @@ class SExpressionStringifier extends Indentation implements Visitor<String> { |
} |
String formatArguments(CallStructure call, |
- List<Reference<Primitive>> arguments, |
- [CallingConvention callingConvention = CallingConvention.Normal]) { |
+ List<Reference<Primitive>> arguments, |
+ [CallingConvention callingConvention = CallingConvention.Normal]) { |
int positionalArgumentCount = call.positionalArgumentCount; |
- if (callingConvention == CallingConvention.Intercepted || |
- callingConvention == CallingConvention.dummyIntercepted) { |
+ if (callingConvention == CallingConvention.Intercepted) { |
++positionalArgumentCount; |
} |
List<String> args = |
- arguments.take(positionalArgumentCount).map(access).toList(); |
+ arguments.getRange(0, positionalArgumentCount).map(access).toList(); |
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)"); |
} |
- // Constructors can have type parameter after the named arguments. |
- args.addAll( |
- arguments.skip(positionalArgumentCount + argumentNames.length) |
- .map(access)); |
return '(${args.join(' ')})'; |
} |
@@ -176,8 +170,7 @@ class SExpressionStringifier extends Indentation implements Visitor<String> { |
String name = access(node.continuation); |
if (node.isRecursive) name = 'rec $name'; |
String args = node.arguments.map(access).join(' '); |
- String escaping = node.isEscapingTry ? ' escape' : ''; |
- return '$indentation(InvokeContinuation $name ($args)$escaping)'; |
+ return '$indentation(InvokeContinuation $name ($args))'; |
} |
String visitThrow(Throw node) { |