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 <torbjorn.svensson@foss.st.com>

diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index c7c015b8d78b65d513dd956cd11784c484530f40..90e2e7e04c9ee5669edc350d8931e2e21b622edb 100644 (file)
--- 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 37df8d33e8917a428e38b3419d76d9f188b50552..c5062ab7715bb76f9a97fe44e7da3988e598c22e 100644 (file)
--- 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 b7bab5b73347bd20177bd87aaac77662f35e8d7c..1818a077bdad320fce73b4cf6a0fec9896a9d526 100644 (file)
--- 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 588e65453f57941f1e776beff44c8d1672082b38..58adb8e97bf034532260d334512fa0293152ce79 100644 (file)
--- 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))