function.c (fndecl_name): Use verbosity 1 (no arguments) for lang_hooks.decl_printabl...

2017-08-23  Richard Biener  <rguenther@suse.de>

	* function.c (fndecl_name): Use verbosity 1 (no arguments) for
	lang_hooks.decl_printable_name.
	* print-rtl-function.c (print_rtx_function): Likewise.
	* tree-pretty-print.c (dump_function_header): Likewise.

	* g++.dg/cpp1y/constexpr-instantiate.C: Adjust.
	* g++.dg/tree-ssa/pr45605.C: Likewise.
	* gnat.dg/noinline2.ad: Likewise.b
	* gnat.dg/renaming6.ad: Likewise.b
	* gnat.dg/renaming6.ad: Likewise.s
	* gnat.dg/specs/noinline3.ad: Likewise.s

From-SVN: r251308

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d221a203a80e8e22997cd83dd0d1db78805b420..f0c1e53b9366d91c57394fc976cf695f4a17b1d9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-23  Richard Biener  <rguenther@suse.de>
+
+       * function.c (fndecl_name): Use verbosity 1 (no arguments) for
+       lang_hooks.decl_printable_name.
+       * print-rtl-function.c (print_rtx_function): Likewise.
+       * tree-pretty-print.c (dump_function_header): Likewise.
+
 2017-08-23  Richard Biener  <rguenther@suse.de>
 
        PR lto/81940

diff --git a/gcc/function.c b/gcc/function.c
index 7fce0c530b8ff91986aafca7822bd1fa842ac2b7..41c4e1e27ced10b292c44ded638effc10614260e 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -6259,7 +6259,7 @@ fndecl_name (tree fndecl)
 {
   if (fndecl == NULL)
     return "(nofn)";
-  return lang_hooks.decl_printable_name (fndecl, 2);
+  return lang_hooks.decl_printable_name (fndecl, 1);
 }
 
 /* Returns the name of function FN.  */

diff --git a/gcc/print-rtl-function.c b/gcc/print-rtl-function.c
index ac8963ec6bb4ee6618c2b0e1765e22efef6fc0ed..55edb7e3f13c4a77ce05f2c0356022762af032d6 100644 (file)
--- a/gcc/print-rtl-function.c
+++ b/gcc/print-rtl-function.c
@@ -227,7 +227,7 @@ print_rtx_function (FILE *outfile, function *fn, bool compact)
 
   tree fdecl = fn->decl;
 
-  const char *dname = lang_hooks.decl_printable_name (fdecl, 2);
+  const char *dname = lang_hooks.decl_printable_name (fdecl, 1);
 
   fprintf (outfile, "(function \"%s\"\n", dname);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ff50edf6d388089d5fb5d352b8bcc05f238719f1..c5da2bac2f40dc6ca8a7263b0336d3b6c8b73139 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-23  Richard Biener  <rguenther@suse.de>
+
+       * g++.dg/cpp1y/constexpr-instantiate.C: Adjust.
+       * g++.dg/tree-ssa/pr45605.C: Likewise.
+       * gnat.dg/noinline2.ad: Likewise.b
+       * gnat.dg/renaming6.ad: Likewise.b
+       * gnat.dg/renaming6.ad: Likewise.s
+       * gnat.dg/specs/noinline3.ad: Likewise.s
+
 2017-08-23  Richard Biener  <rguenther@suse.de>
 
        PR lto/81940

diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C
index ab2021b91bdd56ed427aeeaeeef5d3aabb4b4041..84707b9e8696ea4d62360f030063fe9a84977a77 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C
+++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C
@@ -17,5 +17,5 @@ bool g (int x) { return f (x); }
 template bool f<int>(int);
 
 // Verify that the defintions of both f() and g() are emitted.
-// { dg-final { scan-tree-dump-times "\nconstexpr bool f\\\(" 1 "optimized" } }
-// { dg-final { scan-tree-dump-times "\nbool g\\\(" 1 "optimized" } }
+// { dg-final { scan-tree-dump-times ";; Function f" 1 "optimized" } }
+// { dg-final { scan-tree-dump-times ";; Function g" 1 "optimized" } }

diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr45605.C b/gcc/testsuite/g++.dg/tree-ssa/pr45605.C
index 5460021ae62888724ded34aab95a134168371f4f..1a34249eb2a193067513008d37004f79b20c6c98 100644 (file)
--- a/gcc/testsuite/g++.dg/tree-ssa/pr45605.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr45605.C
@@ -37,4 +37,4 @@ int main() {
 
 
 /* We should devirtualize call to D::Run */
-/* { dg-final { scan-tree-dump-times "D::Run \\(" 1 "fre1" } } */
+/* { dg-final { scan-tree-dump-times "D::Run \\(" 3 "fre1" } } */

diff --git a/gcc/testsuite/gnat.dg/noinline2.adb b/gcc/testsuite/gnat.dg/noinline2.adb
index 3abb33aaa68b9d821e591138f69c0aa4563b0c79..121aee3de910c4059d944a5d3289a377b6c67043 100644 (file)
--- a/gcc/testsuite/gnat.dg/noinline2.adb
+++ b/gcc/testsuite/gnat.dg/noinline2.adb
@@ -18,4 +18,4 @@ package body Noinline2 is
 
 end Noinline2;
 
--- { dg-final { scan-tree-dump-times "noinline2.inner" 2 "optimized"  } }
+-- { dg-final { scan-tree-dump-times "noinline2.inner" 4 "optimized"  } }

diff --git a/gcc/testsuite/gnat.dg/renaming6.adb b/gcc/testsuite/gnat.dg/renaming6.adb
index aff90e4b1f833c2ee70d107ac6074339500c886e..e26c1dffce083c9ab144c53878f0f782c3f79201 100644 (file)
--- a/gcc/testsuite/gnat.dg/renaming6.adb
+++ b/gcc/testsuite/gnat.dg/renaming6.adb
@@ -15,16 +15,16 @@ package body Renaming6 is
 
   function Get_J return Integer is
   begin
-    return J;
+    return X;
   end;
 
   procedure Set_J (Val : Integer) is
   begin
-    J := Val;
+    X := Val;
   end;
 
 end Renaming6;
 
 -- { dg-final { scan-tree-dump-times "atomic_load" 2 "original" } }
 -- { dg-final { scan-tree-dump-times "atomic_store" 2 "original" } }
--- { dg-final { scan-tree-dump-not "j" "original" } }
+-- { dg-final { scan-tree-dump-not "x" "original" } }

diff --git a/gcc/testsuite/gnat.dg/renaming6.ads b/gcc/testsuite/gnat.dg/renaming6.ads
index 5cfef5b999f027cc8a8192b4510fdb92ecd28dac..1d9fbf5c015be713836e908abc554f2891913685 100644 (file)
--- a/gcc/testsuite/gnat.dg/renaming6.ads
+++ b/gcc/testsuite/gnat.dg/renaming6.ads
@@ -6,7 +6,7 @@ package Renaming6 is
   function Get_I return Integer;
   procedure Set_I (Val : Integer);
 
-  J : Integer renames I;
+  X : Integer renames I;
 
   function Get_J return Integer;
   procedure Set_J (Val : Integer);

diff --git a/gcc/testsuite/gnat.dg/specs/noinline3.ads b/gcc/testsuite/gnat.dg/specs/noinline3.ads
index 0828b88cf26fcd803546744086818cb4e13f7f7a..764ab48bbd9679bcc0aff0a70a099b90bcda06d1 100644 (file)
--- a/gcc/testsuite/gnat.dg/specs/noinline3.ads
+++ b/gcc/testsuite/gnat.dg/specs/noinline3.ads
@@ -5,4 +5,4 @@ with Noinline3_Pkg;
 
 package Noinline3 is new Noinline3_Pkg (0);
 
--- { dg-final { scan-tree-dump-times "noinline3.inner" 2 "optimized"  } }
+-- { dg-final { scan-tree-dump-times "noinline3.inner" 4 "optimized"  } }

diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index c7509af198be40add91b5e52bd8cc9eefca7322c..14c7caa60af5f89092a1517adb9516b813675780 100644 (file)
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -4047,7 +4047,7 @@ dump_function_header (FILE *dump_file, tree fdecl, dump_flags_t flags)
   struct cgraph_node *node = cgraph_node::get (fdecl);
   struct function *fun = DECL_STRUCT_FUNCTION (fdecl);
 
-  dname = lang_hooks.decl_printable_name (fdecl, 2);
+  dname = lang_hooks.decl_printable_name (fdecl, 1);
 
   if (DECL_ASSEMBLER_NAME_SET_P (fdecl))
     aname = (IDENTIFIER_POINTER