On September 23, 2016 7:04:29 PM GMT+02:00, Jakub Jelinek <ja...@redhat.com>
wrote:
>Hi!
>
>The generic hooks (except for one mistaken case) don't use any of the
>arguments, and are generally meant to be used by any hooks that have
>such
>arguments, so giving them names isn't really meaningful.
>So, this patch uses the C++ nameless parameters type instead of type
>name
>ATTRIBUTE_UNUSED.
>
>The only exception is default_can_output_mi_thunk_no_vcall, IMHO it
>should
>be moved to targhooks.[ch] instead, but the patch doesn't do that
>(yet).
>
>Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
OK.
Richard.
>2016-09-23 Jakub Jelinek <ja...@redhat.com>
>
> * hooks.c (hook_bool_bool_false, hook_bool_bool_gcc_optionsp_false,
> hook_bool_mode_false, hook_bool_mode_true,
> hook_bool_mode_const_rtx_false, hook_bool_mode_const_rtx_true,
> hook_bool_mode_rtx_false, hook_bool_mode_rtx_true,
> hook_bool_const_rtx_insn_const_rtx_insn_true,
> hook_bool_mode_uhwi_false, hook_void_FILEptr_constcharptr,
> hook_bool_FILEptr_rtx_false, hook_bool_gsiptr_false,
> hook_bool_const_tree_hwi_hwi_const_tree_false,
> hook_bool_const_tree_hwi_hwi_const_tree_true,
> default_can_output_mi_thunk_no_vcall, hook_int_uint_mode_1,
> hook_int_const_tree_0, hook_int_const_tree_const_tree_1,
> hook_int_rtx_0, hook_int_rtx_bool_0, hook_void_tree,
> hook_void_constcharptr, hook_void_tree_treeptr, hook_void_int_int,
> hook_bool_tree_false, hook_bool_const_tree_false, hook_bool_tree_true,
> hook_bool_const_tree_true, hook_bool_tree_tree_false,
> hook_bool_tree_tree_true, hook_bool_tree_bool_false,
> hook_bool_rtx_insn_true, hook_bool_rtx_false,
> hook_bool_uintp_uintp_false,
> hook_bool_rtx_mode_int_int_intp_bool_false, hook_rtx_rtx_null,
> hook_rtx_tree_int_null, hook_uint_mode_0,
> hook_constcharptr_const_tree_null, hook_tree_tree_int_treep_bool_null,
> hook_tree_tree_tree_null, hook_tree_tree_tree_tree_null,
> hook_constcharptr_const_rtx_insn_null,
> hook_constcharptr_const_tree_const_tree_null,
> hook_constcharptr_int_const_tree_null,
> hook_constcharptr_int_const_tree_const_tree_null,
> hook_tree_const_tree_null, hook_bool_rtx_insn_int_false,
> hook_void_rtx_insn_int, hook_void_gcc_optionsp): For arguments with
> ATTRIBUTE_UNUSED, remove parameter name as well as ATTRIBUTE_UNUSED.
>
>--- gcc/hooks.c.jj 2016-09-23 11:57:39.000000000 +0200
>+++ gcc/hooks.c 2016-09-23 12:11:58.597703169 +0200
>@@ -50,76 +50,70 @@ hook_bool_void_true (void)
>
> /* Generic hook that takes (bool) and returns false. */
> bool
>-hook_bool_bool_false (bool a ATTRIBUTE_UNUSED)
>+hook_bool_bool_false (bool)
> {
> return false;
> }
>
>/* Generic hook that takes (bool, struct gcc_options *) and returns
>false. */
> bool
>-hook_bool_bool_gcc_optionsp_false (bool a ATTRIBUTE_UNUSED,
>- struct gcc_options *opts ATTRIBUTE_UNUSED)
>+hook_bool_bool_gcc_optionsp_false (bool, struct gcc_options *)
> {
> return false;
> }
>
> /* Generic hook that takes const int, const int) and returns true. */
>-bool hook_bool_const_int_const_int_true (const int a ATTRIBUTE_UNUSED,
>- const int b ATTRIBUTE_UNUSED)
>+bool hook_bool_const_int_const_int_true (const int, const int)
> {
> return true;
> }
>
> /* Generic hook that takes (machine_mode) and returns false. */
> bool
>-hook_bool_mode_false (machine_mode mode ATTRIBUTE_UNUSED)
>+hook_bool_mode_false (machine_mode)
> {
> return false;
> }
>
> /* Generic hook that takes (machine_mode) and returns true. */
> bool
>-hook_bool_mode_true (machine_mode mode ATTRIBUTE_UNUSED)
>+hook_bool_mode_true (machine_mode)
> {
> return true;
> }
>
>/* Generic hook that takes (machine_mode, const_rtx) and returns false.
> */
> bool
>-hook_bool_mode_const_rtx_false (machine_mode mode ATTRIBUTE_UNUSED,
>- const_rtx value ATTRIBUTE_UNUSED)
>+hook_bool_mode_const_rtx_false (machine_mode, const_rtx)
> {
> return false;
> }
>
>/* Generic hook that takes (machine_mode, const_rtx) and returns true.
>*/
> bool
>-hook_bool_mode_const_rtx_true (machine_mode mode ATTRIBUTE_UNUSED,
>- const_rtx value ATTRIBUTE_UNUSED)
>+hook_bool_mode_const_rtx_true (machine_mode, const_rtx)
> {
> return true;
> }
>
> /* Generic hook that takes (machine_mode, rtx) and returns false. */
> bool
>-hook_bool_mode_rtx_false (machine_mode mode ATTRIBUTE_UNUSED,
>- rtx value ATTRIBUTE_UNUSED)
>+hook_bool_mode_rtx_false (machine_mode, rtx)
> {
> return false;
> }
>
> /* Generic hook that takes (machine_mode, rtx) and returns true. */
> bool
>-hook_bool_mode_rtx_true (machine_mode mode ATTRIBUTE_UNUSED,
>- rtx value ATTRIBUTE_UNUSED)
>+hook_bool_mode_rtx_true (machine_mode, rtx)
> {
> return true;
> }
>
>/* Generic hook that takes (const rtx_insn *, const rtx_insn *) and
>returns true. */
> bool
>-hook_bool_const_rtx_insn_const_rtx_insn_true (const rtx_insn *follower
>ATTRIBUTE_UNUSED,
>- const rtx_insn *followee
>ATTRIBUTE_UNUSED)
>+hook_bool_const_rtx_insn_const_rtx_insn_true (const rtx_insn *,
>+ const rtx_insn *)
> {
> return true;
> }
>@@ -127,15 +121,14 @@ hook_bool_const_rtx_insn_const_rtx_insn_
> /* Generic hook that takes (machine_mode, unsigned HOST_WIDE_INT)
> and returns false. */
> bool
>-hook_bool_mode_uhwi_false (machine_mode mode ATTRIBUTE_UNUSED,
>- unsigned HOST_WIDE_INT value ATTRIBUTE_UNUSED)
>+hook_bool_mode_uhwi_false (machine_mode, unsigned HOST_WIDE_INT)
> {
> return false;
> }
>
>/* Generic hook that takes (FILE *, const char *) and does nothing. */
> void
>-hook_void_FILEptr_constcharptr (FILE *a ATTRIBUTE_UNUSED, const char
>*b ATTRIBUTE_UNUSED)
>+hook_void_FILEptr_constcharptr (FILE *, const char *)
> {
> }
>
>@@ -148,8 +141,7 @@ hook_void_FILEptr_constcharptr_const_tre
>
> /* Generic hook that takes (FILE *, rtx) and returns false. */
> bool
>-hook_bool_FILEptr_rtx_false (FILE *a ATTRIBUTE_UNUSED,
>- rtx b ATTRIBUTE_UNUSED)
>+hook_bool_FILEptr_rtx_false (FILE *, rtx)
> {
> return false;
> }
>@@ -157,61 +149,54 @@ hook_bool_FILEptr_rtx_false (FILE *a ATT
> /* Generic hook that takes (gimple_stmt_iterator *) and returns
> false. */
> bool
>-hook_bool_gsiptr_false (gimple_stmt_iterator *a ATTRIBUTE_UNUSED)
>+hook_bool_gsiptr_false (gimple_stmt_iterator *)
> {
> return false;
> }
>
> /* Used for the TARGET_ASM_CAN_OUTPUT_MI_THUNK hook. */
> bool
>-hook_bool_const_tree_hwi_hwi_const_tree_false (const_tree a
>ATTRIBUTE_UNUSED,
>- HOST_WIDE_INT b ATTRIBUTE_UNUSED,
>- HOST_WIDE_INT c ATTRIBUTE_UNUSED,
>- const_tree d ATTRIBUTE_UNUSED)
>+hook_bool_const_tree_hwi_hwi_const_tree_false (const_tree,
>HOST_WIDE_INT,
>+ HOST_WIDE_INT, const_tree)
> {
> return false;
> }
>
> bool
>-hook_bool_const_tree_hwi_hwi_const_tree_true (const_tree a
>ATTRIBUTE_UNUSED,
>- HOST_WIDE_INT b ATTRIBUTE_UNUSED,
>- HOST_WIDE_INT c ATTRIBUTE_UNUSED,
>- const_tree d ATTRIBUTE_UNUSED)
>+hook_bool_const_tree_hwi_hwi_const_tree_true (const_tree,
>HOST_WIDE_INT,
>+ HOST_WIDE_INT, const_tree)
> {
> return true;
> }
>
> bool
>-default_can_output_mi_thunk_no_vcall (const_tree a ATTRIBUTE_UNUSED,
>- HOST_WIDE_INT b ATTRIBUTE_UNUSED,
>- HOST_WIDE_INT c,
>- const_tree d ATTRIBUTE_UNUSED)
>+default_can_output_mi_thunk_no_vcall (const_tree, HOST_WIDE_INT,
>+ HOST_WIDE_INT c, const_tree)
> {
> return c == 0;
> }
>
> int
>-hook_int_uint_mode_1 (unsigned int a ATTRIBUTE_UNUSED,
>- machine_mode b ATTRIBUTE_UNUSED)
>+hook_int_uint_mode_1 (unsigned int, machine_mode)
> {
> return 1;
> }
>
> int
>-hook_int_const_tree_0 (const_tree a ATTRIBUTE_UNUSED)
>+hook_int_const_tree_0 (const_tree)
> {
> return 0;
> }
>
> /* ??? Used for comp_type_attributes, which ought to return bool. */
> int
>-hook_int_const_tree_const_tree_1 (const_tree a ATTRIBUTE_UNUSED,
>const_tree b ATTRIBUTE_UNUSED)
>+hook_int_const_tree_const_tree_1 (const_tree, const_tree)
> {
> return 1;
> }
>
> int
>-hook_int_rtx_0 (rtx a ATTRIBUTE_UNUSED)
>+hook_int_rtx_0 (rtx)
> {
> return 0;
> }
>@@ -229,7 +214,7 @@ hook_int_rtx_insn_unreachable (rtx_insn
> }
>
> int
>-hook_int_rtx_bool_0 (rtx a ATTRIBUTE_UNUSED, bool b ATTRIBUTE_UNUSED)
>+hook_int_rtx_bool_0 (rtx, bool)
> {
> return 0;
> }
>@@ -247,7 +232,7 @@ hook_uint_void_0 (void)
> }
>
> void
>-hook_void_tree (tree a ATTRIBUTE_UNUSED)
>+hook_void_tree (tree)
> {
> }
>
>@@ -257,88 +242,83 @@ hook_void_rtx_tree (rtx, tree)
> }
>
> void
>-hook_void_constcharptr (const char *a ATTRIBUTE_UNUSED)
>+hook_void_constcharptr (const char *)
> {
> }
>
> void
>-hook_void_tree_treeptr (tree a ATTRIBUTE_UNUSED, tree *b
>ATTRIBUTE_UNUSED)
>+hook_void_tree_treeptr (tree, tree *)
> {
> }
>
> void
>-hook_void_int_int (int a ATTRIBUTE_UNUSED, int b ATTRIBUTE_UNUSED)
>+hook_void_int_int (int, int)
> {
> }
>
> bool
>-hook_bool_tree_false (tree a ATTRIBUTE_UNUSED)
>+hook_bool_tree_false (tree)
> {
> return false;
> }
>
> bool
>-hook_bool_const_tree_false (const_tree a ATTRIBUTE_UNUSED)
>+hook_bool_const_tree_false (const_tree)
> {
> return false;
> }
>
> bool
>-hook_bool_tree_true (tree a ATTRIBUTE_UNUSED)
>+hook_bool_tree_true (tree)
> {
> return true;
> }
>
> bool
>-hook_bool_const_tree_true (const_tree a ATTRIBUTE_UNUSED)
>+hook_bool_const_tree_true (const_tree)
> {
> return true;
> }
>
> bool
>-hook_bool_tree_tree_false (tree a ATTRIBUTE_UNUSED, tree b
>ATTRIBUTE_UNUSED)
>+hook_bool_tree_tree_false (tree, tree)
> {
> return false;
> }
>
> bool
>-hook_bool_tree_tree_true (tree a ATTRIBUTE_UNUSED, tree b
>ATTRIBUTE_UNUSED)
>+hook_bool_tree_tree_true (tree, tree)
> {
> return true;
> }
>
> bool
>-hook_bool_tree_bool_false (tree a ATTRIBUTE_UNUSED, bool b
>ATTRIBUTE_UNUSED)
>+hook_bool_tree_bool_false (tree, bool)
> {
> return false;
> }
>
> bool
>-hook_bool_rtx_insn_true (rtx_insn *insn ATTRIBUTE_UNUSED)
>+hook_bool_rtx_insn_true (rtx_insn *)
> {
> return true;
> }
>
> bool
>-hook_bool_rtx_false (rtx a ATTRIBUTE_UNUSED)
>+hook_bool_rtx_false (rtx)
> {
> return false;
> }
>
> bool
>-hook_bool_uintp_uintp_false (unsigned int *a ATTRIBUTE_UNUSED,
>- unsigned int *b ATTRIBUTE_UNUSED)
>+hook_bool_uintp_uintp_false (unsigned int *, unsigned int *)
> {
> return false;
> }
>
> bool
>-hook_bool_rtx_mode_int_int_intp_bool_false (rtx a ATTRIBUTE_UNUSED,
>- machine_mode b ATTRIBUTE_UNUSED,
>- int c ATTRIBUTE_UNUSED,
>- int d ATTRIBUTE_UNUSED,
>- int *e ATTRIBUTE_UNUSED,
>- bool speed_p ATTRIBUTE_UNUSED)
>+hook_bool_rtx_mode_int_int_intp_bool_false (rtx, machine_mode, int,
>int,
>+ int *, bool)
> {
> return false;
> }
>@@ -359,21 +339,21 @@ hook_rtx_rtx_identity (rtx x)
>
> /* Generic hook that takes an rtx and returns NULL_RTX. */
> rtx
>-hook_rtx_rtx_null (rtx x ATTRIBUTE_UNUSED)
>+hook_rtx_rtx_null (rtx)
> {
> return NULL;
> }
>
> /* Generic hook that takes a tree and an int and returns NULL_RTX. */
> rtx
>-hook_rtx_tree_int_null (tree a ATTRIBUTE_UNUSED, int b
>ATTRIBUTE_UNUSED)
>+hook_rtx_tree_int_null (tree, int)
> {
> return NULL;
> }
>
>/* Generic hook that takes a machine mode and returns an unsigned int
>0. */
> unsigned int
>-hook_uint_mode_0 (machine_mode m ATTRIBUTE_UNUSED)
>+hook_uint_mode_0 (machine_mode)
> {
> return 0;
> }
>@@ -394,66 +374,57 @@ hook_charptr_void_null (void)
>
> /* Generic hook that takes a tree and returns a NULL string. */
> const char *
>-hook_constcharptr_const_tree_null (const_tree t ATTRIBUTE_UNUSED)
>+hook_constcharptr_const_tree_null (const_tree)
> {
> return NULL;
> }
>
> tree
>-hook_tree_tree_int_treep_bool_null (tree t0 ATTRIBUTE_UNUSED,
>- int i ATTRIBUTE_UNUSED,
>- tree *p ATTRIBUTE_UNUSED,
>- bool ignore ATTRIBUTE_UNUSED)
>+hook_tree_tree_int_treep_bool_null (tree, int, tree *, bool)
> {
> return NULL;
> }
>
> tree
>-hook_tree_tree_tree_null (tree t0 ATTRIBUTE_UNUSED, tree t1
>ATTRIBUTE_UNUSED)
>+hook_tree_tree_tree_null (tree, tree)
> {
> return NULL;
> }
>
> tree
>-hook_tree_tree_tree_tree_null (tree t0 ATTRIBUTE_UNUSED,
>- tree t1 ATTRIBUTE_UNUSED,
>- tree t2 ATTRIBUTE_UNUSED)
>+hook_tree_tree_tree_tree_null (tree, tree, tree)
> {
> return NULL;
> }
>
> /* Generic hook that takes an rtx_insn *and returns a NULL string. */
> const char *
>-hook_constcharptr_const_rtx_insn_null (const rtx_insn *insn
>ATTRIBUTE_UNUSED)
>+hook_constcharptr_const_rtx_insn_null (const rtx_insn *)
> {
> return NULL;
> }
>
> const char *
>-hook_constcharptr_const_tree_const_tree_null (const_tree t0
>ATTRIBUTE_UNUSED,
>- const_tree t1 ATTRIBUTE_UNUSED)
>+hook_constcharptr_const_tree_const_tree_null (const_tree, const_tree)
> {
> return NULL;
> }
>
> const char *
>-hook_constcharptr_int_const_tree_null (int i ATTRIBUTE_UNUSED,
>- const_tree t0 ATTRIBUTE_UNUSED)
>+hook_constcharptr_int_const_tree_null (int, const_tree)
> {
> return NULL;
> }
>
> const char *
>-hook_constcharptr_int_const_tree_const_tree_null (int i
>ATTRIBUTE_UNUSED,
>- const_tree t0
>ATTRIBUTE_UNUSED,
>- const_tree t1
>ATTRIBUTE_UNUSED)
>+hook_constcharptr_int_const_tree_const_tree_null (int, const_tree,
>const_tree)
> {
> return NULL;
> }
>
> /* Generic hook that takes a const_tree and returns NULL_TREE. */
> tree
>-hook_tree_const_tree_null (const_tree t ATTRIBUTE_UNUSED)
>+hook_tree_const_tree_null (const_tree)
> {
> return NULL;
> }
>@@ -461,8 +432,7 @@ hook_tree_const_tree_null (const_tree t
>/* Generic hook that takes a rtx_insn * and an int and returns a bool.
>*/
>
> bool
>-hook_bool_rtx_insn_int_false (rtx_insn *insn ATTRIBUTE_UNUSED,
>- int mode ATTRIBUTE_UNUSED)
>+hook_bool_rtx_insn_int_false (rtx_insn *, int)
> {
> return false;
> }
>@@ -470,15 +440,14 @@ hook_bool_rtx_insn_int_false (rtx_insn *
>/* Generic hook that takes a rtx_insn * and an int and returns void.
>*/
>
> void
>-hook_void_rtx_insn_int (rtx_insn *insn ATTRIBUTE_UNUSED,
>- int mode ATTRIBUTE_UNUSED)
>+hook_void_rtx_insn_int (rtx_insn *, int)
> {
> }
>
>/* Generic hook that takes a struct gcc_options * and returns void. */
>
> void
>-hook_void_gcc_optionsp (struct gcc_options *opts ATTRIBUTE_UNUSED)
>+hook_void_gcc_optionsp (struct gcc_options *)
> {
> }
>
>
> Jakub
