aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2023-02-27 10:12:25 -0500
committerPatrick Palka <ppalka@redhat.com>2023-02-27 10:12:25 -0500
commitb800f80b9c866df5ecaff744149ea695c0e24718 (patch)
tree260608cc9ef2efbe3c928c5533adc41d7f724472
parentdfa85beebfbc2f879d30d3918f634feabc851782 (diff)
downloadgcc-b800f80b9c866df5ecaff744149ea695c0e24718.zip
gcc-b800f80b9c866df5ecaff744149ea695c0e24718.tar.gz
gcc-b800f80b9c866df5ecaff744149ea695c0e24718.tar.bz2
don't declare header-defined functions both static and inline, cont.
This fixes some header-defined functions that are undesirably declared static and weren't caught by the "^static inline" pattern used for the main patch r13-6096-gcb3e0eac262e55. 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): Declare inline instead of static.
-rw-r--r--gcc/hash-table.h2
-rw-r--r--gcc/lra-int.h2
-rw-r--r--gcc/recog.h2
-rw-r--r--gcc/sel-sched-ir.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 3f87ec0..c0c6e1c 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 73f8eb0..a400a0f 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 764fa90..539a27c 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 7034a1a..0e87134 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;