https://gcc.gnu.org/g:def106e9a2f219ace006a7a6f03d51acb18d9d46
commit r16-7345-gdef106e9a2f219ace006a7a6f03d51acb18d9d46 Author: Torbjörn SVENSSON <[email protected]> Date: Wed Feb 4 10:37:47 2026 +0100 middle-end: replace CONST_CAST_RTX_INSN with const_cast<struct rtx_insn *> [PR123892] gcc/ChangeLog: PR middle-end/123892 * config/aarch64/aarch64.cc: Replace CONST_CAST_RTX_INSN with const_cast<struct rtx_insn *>. * rtlanal.cc: Likewise. * sched-deps.cc: Likewise. * system.h (CONST_CAST_RTX_INSN): Remove. Signed-off-by: Torbjörn SVENSSON <[email protected]> Diff: --- gcc/config/aarch64/aarch64.cc | 3 ++- gcc/rtlanal.cc | 3 ++- gcc/sched-deps.cc | 2 +- gcc/system.h | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc index c7c015b8d78b..90e2e7e04c9e 100644 --- a/gcc/config/aarch64/aarch64.cc +++ b/gcc/config/aarch64/aarch64.cc @@ -25661,7 +25661,8 @@ seq_cost_ignoring_scalar_moves (const rtx_insn *seq, bool speed) } else { - int this_cost = insn_cost (CONST_CAST_RTX_INSN (seq), speed); + int this_cost = insn_cost (const_cast<struct rtx_insn *> (seq), + speed); if (this_cost > 0) cost += this_cost; else diff --git a/gcc/rtlanal.cc b/gcc/rtlanal.cc index 37df8d33e891..c5062ab7715b 100644 --- a/gcc/rtlanal.cc +++ b/gcc/rtlanal.cc @@ -5827,7 +5827,8 @@ seq_cost (const rtx_insn *seq, bool speed) cost += set_rtx_cost (set, speed); else if (NONDEBUG_INSN_P (seq)) { - int this_cost = insn_cost (CONST_CAST_RTX_INSN (seq), speed); + int this_cost = insn_cost (const_cast<struct rtx_insn *> (seq), + speed); if (this_cost > 0) cost += this_cost; else diff --git a/gcc/sched-deps.cc b/gcc/sched-deps.cc index b7bab5b73347..1818a077bdad 100644 --- a/gcc/sched-deps.cc +++ b/gcc/sched-deps.cc @@ -674,7 +674,7 @@ sched_insn_is_legitimate_for_speculation_p (const rtx_insn *insn, ds_t ds) if (SCHED_GROUP_P (insn)) return false; - if (IS_SPECULATION_CHECK_P (CONST_CAST_RTX_INSN (insn))) + if (IS_SPECULATION_CHECK_P (const_cast<struct rtx_insn *> (insn))) return false; if (side_effects_p (PATTERN (insn))) diff --git a/gcc/system.h b/gcc/system.h index 588e65453f57..58adb8e97bf0 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1196,7 +1196,6 @@ helper_const_non_const_cast (const char *p) #define CONST_CAST(TYPE,X) CONST_CAST2 (TYPE, const TYPE, (X)) #define CONST_CAST_TREE(X) CONST_CAST (union tree_node *, (X)) #define CONST_CAST_RTX(X) CONST_CAST (struct rtx_def *, (X)) -#define CONST_CAST_RTX_INSN(X) CONST_CAST (struct rtx_insn *, (X)) #define CONST_CAST_BB(X) CONST_CAST (struct basic_block_def *, (X)) #define CONST_CAST_GIMPLE(X) CONST_CAST (gimple *, (X))
