don't declare header-defined functions both static and inline, pt 2
Checks
Commit Message
This fixes some header-defined functions that are undesirably declared
static and weren't caught by the "^static inline" pattern used in the
previous patch.
gcc/ChangeLog:
* hash-table.h (gt_pch_nx<hash_table<D>): Remove static.
* lra-int.h (lra_change_class): Likewise.
* recog.h (which_op_alt): Likewise.
* sel-sched-ir.h (sel_bb_empty_or_nop_p): Replace static with
inline.
---
gcc/hash-table.h | 2 +-
gcc/lra-int.h | 2 +-
gcc/recog.h | 2 +-
gcc/sel-sched-ir.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Comments
On Thu, 16 Feb 2023, Patrick Palka wrote:
> This fixes some header-defined functions that are undesirably declared
> static and weren't caught by the "^static inline" pattern used in the
> previous patch.
>
> gcc/ChangeLog:
>
> * hash-table.h (gt_pch_nx<hash_table<D>): Remove static.
> * lra-int.h (lra_change_class): Likewise.
> * recog.h (which_op_alt): Likewise.
> * sel-sched-ir.h (sel_bb_empty_or_nop_p): Replace static with
> inline.
I went ahead and pushed this since I reckon it's a fairly safe/obvious
follow-up to the main patch
(https://gcc.gnu.org/pipermail/gcc-patches/2023-February/612130.html).
> ---
> gcc/hash-table.h | 2 +-
> gcc/lra-int.h | 2 +-
> gcc/recog.h | 2 +-
> gcc/sel-sched-ir.h | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gcc/hash-table.h b/gcc/hash-table.h
> index 3f87ec06f37..c0c6e1cd83d 100644
> --- a/gcc/hash-table.h
> +++ b/gcc/hash-table.h
> @@ -1275,7 +1275,7 @@ hashtab_entry_note_pointers (void *obj, void *h, gt_pointer_operator op,
> }
>
> template<typename D>
> -static void
> +void
> gt_pch_nx (hash_table<D> *h)
> {
> h->check_complete_insertion ();
> diff --git a/gcc/lra-int.h b/gcc/lra-int.h
> index 73f8eb004b0..a400a0f85e2 100644
> --- a/gcc/lra-int.h
> +++ b/gcc/lra-int.h
> @@ -428,7 +428,7 @@ lra_get_regno_hard_regno (int regno)
>
> /* Change class of pseudo REGNO to NEW_CLASS. Print info about it
> using TITLE. Output a new line if NL_P. */
> -static void inline
> +inline void
> lra_change_class (int regno, enum reg_class new_class,
> const char *title, bool nl_p)
> {
> diff --git a/gcc/recog.h b/gcc/recog.h
> index 764fa90afde..539a27c3edf 100644
> --- a/gcc/recog.h
> +++ b/gcc/recog.h
> @@ -382,7 +382,7 @@ extern const operand_alternative *recog_op_alt;
> on operand OP of the current instruction alternative (which_alternative).
> Only valid after calling preprocess_constraints and constrain_operands. */
>
> -inline static const operand_alternative *
> +inline const operand_alternative *
> which_op_alt ()
> {
> gcc_checking_assert (IN_RANGE (which_alternative, 0,
> diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h
> index 7034a1ab06c..0e87134c6db 100644
> --- a/gcc/sel-sched-ir.h
> +++ b/gcc/sel-sched-ir.h
> @@ -1096,7 +1096,7 @@ get_loop_exit_edges_unique_dests (const class loop *loop)
> return edges;
> }
>
> -static bool
> +inline bool
> sel_bb_empty_or_nop_p (basic_block bb)
> {
> insn_t first = sel_bb_head (bb), last;
> --
> 2.39.2.422.gc867e4fa18
>
>
@@ -1275,7 +1275,7 @@ hashtab_entry_note_pointers (void *obj, void *h, gt_pointer_operator op,
}
template<typename D>
-static void
+void
gt_pch_nx (hash_table<D> *h)
{
h->check_complete_insertion ();
@@ -428,7 +428,7 @@ lra_get_regno_hard_regno (int regno)
/* Change class of pseudo REGNO to NEW_CLASS. Print info about it
using TITLE. Output a new line if NL_P. */
-static void inline
+inline void
lra_change_class (int regno, enum reg_class new_class,
const char *title, bool nl_p)
{
@@ -382,7 +382,7 @@ extern const operand_alternative *recog_op_alt;
on operand OP of the current instruction alternative (which_alternative).
Only valid after calling preprocess_constraints and constrain_operands. */
-inline static const operand_alternative *
+inline const operand_alternative *
which_op_alt ()
{
gcc_checking_assert (IN_RANGE (which_alternative, 0,
@@ -1096,7 +1096,7 @@ get_loop_exit_edges_unique_dests (const class loop *loop)
return edges;
}
-static bool
+inline bool
sel_bb_empty_or_nop_p (basic_block bb)
{
insn_t first = sel_bb_head (bb), last;