Clean up FunctionDefinition in the IR S-expression representation.

tests/compiler/dart2js/backend_dart/opt_constprop_test.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.
 
 import 'dart:async';
 import '../mock_compiler.dart';
 import 'sexpr_unstringifier.dart';
 import 'package:async_helper/async_helper.dart';
 import "package:expect/expect.dart";
 import 'package:compiler/src/cps_ir/cps_ir_nodes_sexpr.dart';
@@ skipping 10 matching lines @@
 //    int j;
 //    if (i == 1) {
 //      j = 2;
 //    } else {
 //      j = 3;
 //    }
 //    return j;
 //  }
 
 String CP1_IN = """
-(FunctionDefinition main (return) (LetPrim v0 (Constant IntConstant(1)))
+(FunctionDefinition main () return ()
+  (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(1)))
   (LetCont (k0 v2)
     (LetCont (k1) (LetPrim v3 (Constant IntConstant(2)))
       (InvokeContinuation return v3))
     (LetCont (k2) (LetPrim v4 (Constant IntConstant(3)))
       (InvokeContinuation return v4))
     (Branch (IsTrue v2) k1 k2))
   (InvokeMethod v0 == v1 k0))
 """;
 String CP1_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(1)))
   (LetCont (k0 v2)
     (LetCont (k1)
       (LetPrim v3 (Constant IntConstant(2)))
       (InvokeContinuation return v3))
     (LetCont (k2)
       (LetPrim v4 (Constant IntConstant(3)))
       (InvokeContinuation return v4))
     (InvokeContinuation k1 ))
@@ skipping 10 matching lines @@
 //        return i;
 //      }
 //      if (true && i == 1) {
 //        return i;
 //      }
 //    }
 //    return 42;
 //  }
 
 String CP2_IN = """
-(FunctionDefinition main (return) (LetPrim v0 (Constant IntConstant(1)))
+(FunctionDefinition main () return ()
+  (LetPrim v0 (Constant IntConstant(1)))
   (LetCont* (k0)
     (LetCont (k1) (LetPrim v1 (Constant IntConstant(42)))
       (InvokeContinuation return v1))
     (LetCont (k2) (LetPrim v2 (Constant BoolConstant(false)))
       (LetCont (k3 v3)
         (LetCont (k4) (InvokeContinuation return v0))
         (LetCont (k5) (LetPrim v4 (Constant BoolConstant(true)))
           (LetCont (k6 v5)
             (LetCont (k7) (InvokeContinuation return v0))
             (LetCont (k8) (InvokeContinuation* k0))
@@ skipping 17 matching lines @@
           (InvokeContinuation k3 v13))
         (LetCont (k17) (LetPrim v14 (Constant BoolConstant(false)))
           (InvokeContinuation k3 v14))
         (Branch (IsTrue v12) k16 k17))
       (Branch (IsTrue v2) k14 k15))
     (LetPrim v15 (Constant BoolConstant(true)))
     (Branch (IsTrue v15) k2 k1))
   (InvokeContinuation k0))
 """;
 String CP2_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetCont* (k0)
     (LetCont (k1) (LetPrim v1 (Constant IntConstant(42)))
       (InvokeContinuation return v1))
     (LetCont (k2)
       (LetPrim v2 (Constant BoolConstant(false)))
       (LetCont (k3 v3)
         (LetCont (k4) (InvokeContinuation return v0))
         (LetCont (k5)
           (LetPrim v4 (Constant BoolConstant(true)))
@@ skipping 37 matching lines @@
 //  int main() {
 //    int i = 1;
 //    i = f();
 //    if (i == 1) {
 //      return 42;
 //    }
 //    return i;
 //  }
 
 String CP3_IN = """
-(FunctionDefinition main ( return) (LetPrim v0 (Constant IntConstant(1)))
+(FunctionDefinition main () return ()
+  (LetPrim v0 (Constant IntConstant(1)))
   (LetCont (k0 v1) (LetPrim v2 (Constant IntConstant(1)))
     (LetCont (k1 v3)
       (LetCont (k2) (LetPrim v4 (Constant IntConstant(42)))
         (InvokeContinuation return v4))
       (LetCont (k3) (InvokeContinuation return v1))
       (Branch (IsTrue v3) k2 k3))
     (InvokeMethod v1 == v2 k1))
   (InvokeStatic f k0))
 """;
 String CP3_OUT = CP3_IN;
 
 // Addition.
 
 String CP4_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(2)))
   (LetCont (k0 v2)
      (InvokeContinuation return v2))
   (InvokeMethod v0 + v1 k0))
 """;
 String CP4_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(2)))
   (LetCont (k0 v2)
      (InvokeContinuation return v2))
   (LetPrim v3 (Constant IntConstant(3)))
   (InvokeContinuation k0 v3))
 """;
 
 // Array access operator (no optimization).
 
 String CP5_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(2)))
   (LetCont (k0 v2)
      (InvokeContinuation return v2))
   (InvokeMethod v0 [] v1 k0))
 """;
 String CP5_OUT = CP5_IN;
 
 // Division by 0.
 
 String CP6_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(0)))
   (LetCont (k0 v2)
      (InvokeContinuation return v2))
   (InvokeMethod v0 / v1 k0))
 """;
 String CP6_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(0)))
   (LetCont (k0 v2)
      (InvokeContinuation return v2))
   (LetPrim v3 (Constant DoubleConstant(Infinity)))
   (InvokeContinuation k0 v3))
 """;
 
 // Concatenate strings.
 
 String CP7_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant StringConstant("b")))
   (LetPrim v1 (Constant StringConstant("d")))
   (LetPrim v2 (Constant StringConstant("a")))
   (LetPrim v3 (Constant StringConstant("c")))
   (LetPrim v4 (Constant StringConstant("")))
   (LetCont (k0 v5)
     (LetCont (k1 v6)
       (InvokeContinuation return v6))
     (InvokeMethod v5 length k1))
   (ConcatenateStrings v2 v0 v3 v1 v4 k0))
 """;
 String CP7_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant StringConstant("b")))
   (LetPrim v1 (Constant StringConstant("d")))
   (LetPrim v2 (Constant StringConstant("a")))
   (LetPrim v3 (Constant StringConstant("c")))
   (LetPrim v4 (Constant StringConstant("")))
   (LetCont (k0 v5)
     (LetCont (k1 v6)
       (InvokeContinuation return v6))
     (InvokeMethod v5 length k1))
   (LetPrim v7 (Constant StringConstant("abcd")))
   (InvokeContinuation k0 v7))
 """;
 
 // TODO(jgruber): We can't test is-check optimization because the unstringifier
 // does not recreate accurate types for the TypeOperator node.
 
 // Simple branch removal.
 
 String CP8_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(1)))
   (LetCont (k0 v2)
     (LetCont (k1)
       (LetPrim v3 (Constant IntConstant(42)))
       (InvokeContinuation return v3))
     (LetCont (k2)
       (InvokeContinuation return v0))
     (Branch (IsTrue v2) k1 k2))
   (InvokeMethod v0 == v1 k0))
 """;
 String CP8_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetPrim v1 (Constant IntConstant(1)))
   (LetCont (k0 v2)
     (LetCont (k1) (LetPrim v3 (Constant IntConstant(42)))
       (InvokeContinuation return v3))
     (LetCont (k2) (InvokeContinuation return v0))
     (InvokeContinuation k1 ))
   (LetPrim v4 (Constant BoolConstant(true)))
   (InvokeContinuation k0 v4))
 """;
 
 // While loop.
 
 String CP9_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetCont* (k0 v1)
     (LetCont (k1)
       (InvokeContinuation return v1))
     (LetCont (k2)
       (LetPrim v2 (Constant IntConstant(1)))
       (LetCont (k3 v3)
         (LetCont (k4 v4)
           (LetCont (k5)
             (LetPrim v5 (Constant IntConstant(42)))
@@ skipping 10 matching lines @@
         (LetCont (k9)
           (LetPrim v9 (Constant BoolConstant(true)))
           (InvokeContinuation k4 v9))
         (Branch (IsTrue v3) k8 k9))
       (InvokeMethod v1 == v2 k3))
     (LetPrim v10 (Constant BoolConstant(true)))
     (Branch (IsTrue v10) k2 k1))
   (InvokeContinuation k0 v0))
 """;
 String CP9_OUT = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(1)))
   (LetCont* (k0 v1)
     (LetCont (k1)
       (InvokeContinuation return v1))
     (LetCont (k2)
       (LetPrim v2 (Constant IntConstant(1)))
       (LetCont (k3 v3)
         (LetCont (k4 v4)
           (LetCont (k5)
             (LetPrim v5 (Constant IntConstant(42)))
@@ skipping 19 matching lines @@
 
 // While loop, from:
 //
 //  int main() {
 //    for (int i = 0; i < 2; i++) {
 //      print(42 + i);
 //    }
 //  }
 
 String CP10_IN = """
-(FunctionDefinition main ( return)
+(FunctionDefinition main () return ()
   (LetPrim v0 (Constant IntConstant(0)))
   (LetCont* (k0 v1)
     (LetCont (k1)
       (LetPrim v2 (Constant NullConstant))
       (InvokeContinuation return v2))
     (LetCont (k2)
       (LetPrim v3 (Constant IntConstant(42)))
       (LetCont (k3 v4)
         (LetCont (k4 v5)
           (LetPrim v6 (Constant IntConstant(1)))
@@ skipping 46 matching lines @@
   asyncTest(() => testConstantPropagator(CP2_IN, CP2_OUT));
   asyncTest(() => testConstantPropagator(CP3_IN, CP3_OUT));
   asyncTest(() => testConstantPropagator(CP4_IN, CP4_OUT));
   asyncTest(() => testConstantPropagator(CP5_IN, CP5_OUT));
   asyncTest(() => testConstantPropagator(CP6_IN, CP6_OUT));
   asyncTest(() => testConstantPropagator(CP7_IN, CP7_OUT));
   asyncTest(() => testConstantPropagator(CP8_IN, CP8_OUT));
   asyncTest(() => testConstantPropagator(CP9_IN, CP9_OUT));
   asyncTest(() => testConstantPropagator(CP10_IN, CP10_OUT));
 }