[PATCH 3/8] middle-end: replace CONST_CAST_BB with const_cast [PR123892]

[Torbjörn SVENSSON]

gcc/ChangeLog:

        PR middle-end/123892
        * system.h: Remove.
        * tracer.cc: Replace CONST_CAST_BB with
        const_cast<basic_block>.
        * tree-cfg.cc: Likewise.

Signed-off-by: Torbjörn SVENSSON <torbjorn.svens...@foss.st.com>
---
 gcc/system.h    | 1 -
 gcc/tracer.cc   | 3 ++-
 gcc/tree-cfg.cc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/system.h b/gcc/system.h
index d1710307b3a..8ea4897cc20 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -1195,7 +1195,6 @@ helper_const_non_const_cast (const char *p)
 #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_BB(X) CONST_CAST (struct basic_block_def *, (X))
 #define CONST_CAST_GIMPLE(X) CONST_CAST (gimple *, (X))
 
 /* Activate certain diagnostics as warnings (not errors via the
diff --git a/gcc/tracer.cc b/gcc/tracer.cc
index 04a3d156592..75567683dfa 100644
--- a/gcc/tracer.cc
+++ b/gcc/tracer.cc
@@ -139,7 +139,8 @@ analyze_bb (basic_block bb, int *count)
     }
   *count = n;
 
-  cache_can_duplicate_bb_p (bb, can_duplicate_block_p (CONST_CAST_BB (bb)));
+  cache_can_duplicate_bb_p (bb, can_duplicate_block_p (const_cast<basic_block>
+                                                      (bb)));
 }
 
 /* Return true if E1 is more frequent than E2.  */
diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index f9a71f0a8be..66ea54f8b85 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -6412,7 +6412,7 @@ gimple_split_block_before_cond_jump (basic_block bb)
 static bool
 gimple_can_duplicate_bb_p (const_basic_block bb)
 {
-  gimple *last = last_nondebug_stmt (CONST_CAST_BB (bb));
+  gimple *last = last_nondebug_stmt (const_cast<basic_block> (bb));
 
   /* Do checks that can only fail for the last stmt, to minimize the work in 
the
      stmt loop.  */
@@ -6437,7 +6437,7 @@ gimple_can_duplicate_bb_p (const_basic_block bb)
       return false;
   }
 
-  for (gimple_stmt_iterator gsi = gsi_start_bb (CONST_CAST_BB (bb));
+  for (gimple_stmt_iterator gsi = gsi_start_bb (const_cast<basic_block> (bb));
        !gsi_end_p (gsi); gsi_next (&gsi))
     {
       gimple *g = gsi_stmt (gsi);
-- 
2.43.0