Revert r209902 "Dump the return type of functions in gimple dumps"

This commit reverts r209902 aka 1f09cb43ee8e199dca339233fb1b92b7ffdbc660
due to issues described in
  https://gcc.gnu.org/ml/gcc-patches/2014-05/msg01271.html

gcc/
2014-05-16  David Malcolm  <dmalcolm@redhat.com>

	Revert:
	2014-04-29  David Malcolm  <dmalcolm@redhat.com>

	* tree-cfg.c (dump_function_to_file): Dump the return type of
	functions, in a line to itself before the function body, mimicking
	the layout of a C function.

gcc/testsuite
2014-05-16  David Malcolm  <dmalcolm@redhat.com>

	Revert:
	2014-04-29  David Malcolm  <dmalcolm@redhat.com>

	* gcc.dg/tree-ssa/pr23401.c: Update the expected number of
	occurrences of "int" in the gimple dump to reflect that the return
	types of functions now show up in such dumps.
	* gcc.dg/tree-ssa/pr27810.c: Likewise.

From-SVN: r210533

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be8026a779d8639020011fbd43521e6807647bd0..8fb676e530b5bf9343ab4238a44591f6d76b50e5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-16  David Malcolm  <dmalcolm@redhat.com>
+
+       Revert:
+       2014-04-29  David Malcolm  <dmalcolm@redhat.com>
+
+       * tree-cfg.c (dump_function_to_file): Dump the return type of
+       functions, in a line to itself before the function body, mimicking
+       the layout of a C function.
+
 2014-05-16  Dehao Chen  <dehao@google.com>
 
        * cfghooks.c (make_forwarder_block): Use direct computation to

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5aee09ad14c53589238c616736ece627bf2c6b8d..d02f064224c6bf206739a0763a0fde5bc6c38ddb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-16  David Malcolm  <dmalcolm@redhat.com>
+
+       Revert:
+       2014-04-29  David Malcolm  <dmalcolm@redhat.com>
+
+       * gcc.dg/tree-ssa/pr23401.c: Update the expected number of
+       occurrences of "int" in the gimple dump to reflect that the return
+       types of functions now show up in such dumps.
+       * gcc.dg/tree-ssa/pr27810.c: Likewise.
+
 2014-05-16  Jan Hubicka  <hubicka@ucw.cz>
 
        * gcc.c-torture/execute/20101011-1.c: Update testcase.

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c
index 3940692cd6c396d2d2b06f55397d4ae2f46de27d..1d30ac7519f5369ffe5fc0c6ebc07324b9f14ef5 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c
@@ -19,6 +19,6 @@ int ffff(int i)
 
 /* We should not use extra temporaries apart from for i1 + i2.  */
 
-/* { dg-final { scan-tree-dump-times "int" 6 "gimple" } } */
+/* { dg-final { scan-tree-dump-times "int" 5 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "int D\\\." 1 "gimple" } } */
 /* { dg-final { cleanup-tree-dump "gimple" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c
index 6d0904bb06b34f9849b2e588c3080fa5e18d9171..c7da3bd5d06b7669ec0aa141f1977ad6e2f1cbe8 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c
@@ -13,6 +13,6 @@ int qqq (int a)
 /* We should not use an extra temporary for the result of the
    function call.  */
 
-/* { dg-final { scan-tree-dump-times "int" 4 "gimple" } } */
+/* { dg-final { scan-tree-dump-times "int" 3 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "int D\\\." 1 "gimple" } } */
 /* { dg-final { cleanup-tree-dump "gimple" } } */

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 9228d41970ccca896e8c161da4e9e898a47e8853..9be04fe81b59f22096dd90adaccbe3f2fffbe7bc 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -7089,12 +7089,6 @@ dump_function_to_file (tree fndecl, FILE *file, int flags)
   struct function *fun = DECL_STRUCT_FUNCTION (fndecl);
 
   current_function_decl = fndecl;
-
-  /* Print the return type of the function: */
-  print_generic_expr (file, TREE_TYPE (TREE_TYPE (fun->decl)),
-                     dump_flags | TDF_SLIM);
-  fprintf (file, "\n");
-
   fprintf (file, "%s %s(", function_name (fun), tmclone ? "[tm-clone] " : "");
 
   arg = DECL_ARGUMENTS (fndecl);