middle-end: replace CONST_CAST_GIMPLE with const_cast<gimple *> [PR123892]

gcc/ChangeLog:

	PR middle-end/123892
	* gimple.h: Replace CONST_CAST_GIMPLE with const_cast<gimple *>.
	* system.h (CONST_CAST_GIMPLE): Remove.

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>

diff --git a/gcc/gimple.h b/gcc/gimple.h
index 22e3462259fbb9f9b264bf47d8b915559c57f9fd..2484a33f47651a440b5b87cba9027b5443ec9a3e 100644 (file)
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -2606,7 +2606,7 @@ gimple_op (const gimple *gs, unsigned i)
   if (gimple_has_ops (gs))
     {
       gcc_gimple_checking_assert (i < gimple_num_ops (gs));
-      return gimple_ops (CONST_CAST_GIMPLE (gs))[i];
+      return gimple_ops (const_cast<gimple *> (gs))[i];
     }
   else
     return NULL_TREE;

diff --git a/gcc/system.h b/gcc/system.h
index 8ea4897cc20c746a2e4cf2b0d27f8f23bb34613b..faa6857690ad57d70893ae38110d5cc692fd2169 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -1194,8 +1194,6 @@ helper_const_non_const_cast (const char *p)
 #endif
 #endif
 #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_GIMPLE(X) CONST_CAST (gimple *, (X))
 
 /* Activate certain diagnostics as warnings (not errors via the
    -Werror flag).  */