Clean up FunctionDefinition in the IR S-expression representation.

tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart

Index: tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart
diff --git a/tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart b/tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart
index 4b3fc39003adfd0fd50e5e5b8859b6cbf4dc39e3..32cfc64b4830987a023eecc6dcd89412f24e2256 100644
--- a/tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart
+++ b/tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart
@@ -20,12 +20,15 @@ import 'package:compiler/src/cps_ir/optimizers.dart';
 //  }
 
 String DEAD_VAL_IN = """
-(FunctionDefinition main ( return) (LetPrim v0 (Constant IntConstant(42)))
-  (LetPrim v1 (Constant IntConstant(0))) (InvokeContinuation return v1))
+(FunctionDefinition main () return ()
+  (LetPrim v0 (Constant IntConstant(42)))
+  (LetPrim v1 (Constant IntConstant(0)))
+  (InvokeContinuation return v1))
 """;
 String DEAD_VAL_OUT = """
-(FunctionDefinition main ( return)
-  (LetPrim v0 (Constant IntConstant(0))) (InvokeContinuation return v0))
+(FunctionDefinition main () return ()
+  (LetPrim v0 (Constant IntConstant(0)))
+  (InvokeContinuation return v0))
 """;
 
 // Iterative dead-val. No optimizations possible since the continuation to
@@ -38,7 +41,7 @@ String DEAD_VAL_OUT = """
 //  }
 
 String ITERATIVE_DEAD_VAL1_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(42)))
   (LetPrim v1 (Constant IntConstant(1)))
   (LetCont (k0 v2) (LetPrim v3 (Constant IntConstant(0)))
@@ -50,17 +53,17 @@ String ITERATIVE_DEAD_VAL1_OUT = ITERATIVE_DEAD_VAL1_IN;
 // Iterative dead-val. IR written by hand.
 
 String ITERATIVE_DEAD_VAL2_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(42)))
   (LetPrim v1
     (CreateFunction
-      (FunctionDefinition f (i return)
+      (FunctionDefinition f (i) return ()
         (InvokeContinuation return v0))))
   (LetPrim v2 (Constant IntConstant(0)))
   (InvokeContinuation return v2))
 """;
 String ITERATIVE_DEAD_VAL2_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (InvokeContinuation return v0))
 """;
@@ -69,7 +72,7 @@ String ITERATIVE_DEAD_VAL2_OUT = """
 // IR written by hand.
 
 String DEAD_CONT_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v4 (Constant IntConstant(0)))
   (LetCont (k0 v0) (InvokeConstructor List return))
   (LetCont (k1 v1)
@@ -79,7 +82,7 @@ String DEAD_CONT_IN = """
   (InvokeStatic print v4 k1))
 """;
 String DEAD_CONT_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0 v1)
     (LetCont (k1 v2) (LetPrim v3 (Constant IntConstant(0)))
@@ -91,7 +94,7 @@ String DEAD_CONT_OUT = """
 // Iterative dead-cont. IR written by hand.
 
 String ITERATIVE_DEAD_CONT_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v4 (Constant IntConstant(0)))
   (LetCont (k0 v0) (InvokeConstructor List return))
   (LetCont (k3 v5) (InvokeContinuation k0 v5))
@@ -102,7 +105,7 @@ String ITERATIVE_DEAD_CONT_IN = """
   (InvokeStatic print v4 k1))
 """;
 String ITERATIVE_DEAD_CONT_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0 v1)
     (LetCont (k1 v2) (LetPrim v3 (Constant IntConstant(0)))
@@ -115,7 +118,7 @@ String ITERATIVE_DEAD_CONT_OUT = """
 // IR written by hand.
 
 String BETA_CONT_LIN_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetCont (k0 v0)
     (LetCont (k1 v1)
       (LetCont (k2 v2) (LetPrim v3 (Constant IntConstant(0)))
@@ -126,7 +129,7 @@ String BETA_CONT_LIN_IN = """
   (InvokeContinuation k0 v4))
 """;
 String BETA_CONT_LIN_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0 v1)
     (LetCont (k1 v2) (LetPrim v3 (Constant IntConstant(0)))
@@ -138,7 +141,7 @@ String BETA_CONT_LIN_OUT = """
 // Beta-cont-lin with recursive continuation. IR written by hand.
 
 String RECURSIVE_BETA_CONT_LIN_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetCont* (k0 v0)
     (InvokeContinuation* k0 v0))
   (LetPrim v1 (Constant IntConstant(0)))
@@ -149,7 +152,7 @@ String RECURSIVE_BETA_CONT_LIN_OUT = RECURSIVE_BETA_CONT_LIN_IN;
 // Beta-cont-lin used inside body. IR written by hand.
 
 String USED_BETA_CONT_LIN_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0 v1)
     (LetCont (k1 v2)
@@ -159,7 +162,7 @@ String USED_BETA_CONT_LIN_IN = """
     (InvokeStatic print v1 k1))
     (LetPrim v5
       (CreateFunction
-        (FunctionDefinition f ( return)
+        (FunctionDefinition f () return ()
           (InvokeContinuation return v1))))
   (InvokeContinuation k0 v0))
 """;
@@ -169,18 +172,18 @@ String USED_BETA_CONT_LIN_OUT = USED_BETA_CONT_LIN_IN;
 // IR written by hand.
 
 String ETA_CONT_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v3 (Constant IntConstant(0)))
   (LetCont* (k1 v1) (InvokeContinuation return v3))
   (LetCont (k0 v0) (InvokeContinuation k1 v0))
   (LetPrim v4
     (CreateFunction
-      (FunctionDefinition f ( return)
+      (FunctionDefinition f () return ()
         (InvokeContinuation k1 v3))))
   (InvokeContinuation k0 v3))
 """;
 String ETA_CONT_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont (k0 v1) (InvokeContinuation return v0))
   (InvokeContinuation k0 v0))