From 9678086db16d5d3a30413db35157975d3bd25774 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Mon, 27 Aug 2007 03:45:06 +0000 Subject: alias.c (memory_modified_1, [...]): Constify. * alias.c (memory_modified_1, memory_modified_in_insn_p): Constify. * basic-block.h (tree_predicted_by_p, rtl_predicted_by_p): Likewise. * bb-reorder.c (copy_bb_p): Likewise. * cfghooks.c (can_remove_branch_p, can_merge_blocks_p, predicted_by_p, can_duplicate_block_p, block_ends_with_call_p, block_ends_with_condjump_p): Likewise. * cfghooks.h (can_remove_branch_p, can_merge_blocks_p, predicted_by_p, can_duplicate_block_p, block_ends_with_call_p, block_ends_with_condjump_p): Likewise. * cfglayout.c (cfg_layout_can_duplicate_bb_p): Likewise. * cfgrtl.c (can_delete_note_p, can_delete_label_p, rtl_can_merge_blocks, cfg_layout_can_merge_blocks_p, rtl_block_ends_with_call_p, rtl_block_ends_with_condjump_p, need_fake_edge_p, rtl_can_remove_branch_p): Likewise. * dbxout.c (dbx_debug_hooks, xcoff_debug_hooks): Use debug_true_const_tree instad of debug_true_tree. * debug.c (do_nothing_debug_hooks): Likewise. * debug.h (ignore_block, debug_true_const_tree): Constify. * dwarf2out.c (stack_adjust_offset, clobbers_queued_reg_save, dwarf2out_ignore_block, is_pseudo_reg, is_tagged_type, decl_ultimate_origin, block_ultimate_origin, lookup_decl_loc, same_dw_val_p, add_ranges, is_subrange_type, type_is_enum, dbx_reg_number, is_based_loc, field_type, simple_type_align_in_bits, simple_decl_align_in_bits, simple_type_size_in_bits, field_byte_offset, insert_float, type_tag, member_declared_type, is_redundant_typedef, secname_for_decl, is_inlined_entry_point): Likewise. * emit-rtl.c (const_next_insn, const_previous_insn, const_next_nonnote_insn, const_prev_nonnote_insn, const_next_real_insn, const_prev_real_insn, const_next_active_insn, const_prev_active_insn, const_next_label, const_prev_label): Likewise. * except.h (lookup_stmt_eh_region_fn, lookup_stmt_eh_region): Likewise. * haifa-sched.c (may_trap_exp, haifa_classify_insn, find_set_reg_weight, no_real_insns_p, find_set_reg_weight, sched_insn_is_legitimate_for_speculation_p): Likewise. * jump.c (reversed_comparison_code_parts, reversed_comparison_code, reversed_comparison, condjump_label): Likewise. * predict.c (rtl_predicted_by_p, tree_predicted_by_p): Likewise. * reg-stack.c (stack_regs_mentioned_p, stack_regs_mentioned): Likewise. * rtl.h (const_previous_insn, const_next_insn, const_prev_nonnote_insn, const_next_nonnote_insn, const_prev_real_insn, const_next_real_insn, const_prev_active_insn, const_next_active_insn, const_prev_label, const_next_label, modified_between_p, modified_in_p, const_note_storeskeep_with_call_p, condjump_label, reversed_comparison, reversed_comparison_code, reversed_comparison_code_parts, memory_modified_in_insn_p, stack_regs_mentioned): Likewise. * rtlanal.c (modified_between_p, modified_in_p, const_note_stores, keep_with_call_p): Likewise. * sched-deps.c (deps_may_trap_p, sched_get_condition, conditions_mutex_p, sched_insns_conditions_mutex_psd_next_list, sd_lists_size, sd_lists_empty_p): Likewise. * sched-int.h (sched_insns_conditions_mutex_p, haifa_classify_insn, no_real_insns_p, sched_insn_is_legitimate_for_speculation_p, sd_next_list, sd_lists_size, sd_lists_empty_p): Likewise. * sdbout.c (sdb_debug_hooks): Likewise. * tree-cfg.c (tree_can_merge_blocks_p, is_ctrl_altering_stmt, stmt_ends_bb_p, tree_can_remove_branch_p, tree_can_duplicate_bb_p, -tree_block_ends_with_call_p, tree_block_ends_with_condjump_p): Likewise. * tree-eh.c (lookup_stmt_eh_region_fn, lookup_stmt_eh_region, tree_can_throw_internal): Likewise. * tree-flow-inline.h (phi_nodes): Likewise. * tree-flow.h (phi_nodesstmt_ends_bb_p, is_ctrl_altering_stmt, tree_can_throw_internal, lookup_stmt_eh_region): Likewise. * tree-gimple.c (const_get_call_expr_in): Likewise. * tree-gimple.h (const_get_call_expr_in): Likewise. * tree.c (const_lookup_attribute, attribute_list_equal, attribute_list_contained): Likewise. * tree.h (attribute_list_equal, attribute_list_contained, const_lookup_attribute): Likewise. * vmsdbgout.c (vmsdbgout_ignore_block): Likewise. From-SVN: r127824 --- gcc/tree-cfg.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'gcc/tree-cfg.c') diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index e9be4d4..8e889fa 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -104,7 +104,7 @@ static inline void change_bb_for_stmt (tree t, basic_block bb); /* Flowgraph optimization and cleanup. */ static void tree_merge_blocks (basic_block, basic_block); -static bool tree_can_merge_blocks_p (basic_block, basic_block); +static bool tree_can_merge_blocks_p (const_basic_block, const_basic_block); static void remove_bb (basic_block); static edge find_taken_edge_computed_goto (basic_block, tree); static edge find_taken_edge_cond_expr (basic_block, tree); @@ -1135,10 +1135,10 @@ group_case_labels (void) /* Checks whether we can merge block B into block A. */ static bool -tree_can_merge_blocks_p (basic_block a, basic_block b) +tree_can_merge_blocks_p (const_basic_block a, const_basic_block b) { - tree stmt; - block_stmt_iterator bsi; + const_tree stmt; + const_block_stmt_iterator bsi; tree phi; if (!single_succ_p (a)) @@ -1158,7 +1158,7 @@ tree_can_merge_blocks_p (basic_block a, basic_block b) /* If A ends by a statement causing exceptions or something similar, we cannot merge the blocks. */ - stmt = last_stmt (a); + stmt = const_last_stmt (a); if (stmt && stmt_ends_bb_p (stmt)) return false; @@ -1184,9 +1184,9 @@ tree_can_merge_blocks_p (basic_block a, basic_block b) } /* Do not remove user labels. */ - for (bsi = bsi_start (b); !bsi_end_p (bsi); bsi_next (&bsi)) + for (bsi = cbsi_start (b); !cbsi_end_p (bsi); cbsi_next (&bsi)) { - stmt = bsi_stmt (bsi); + stmt = cbsi_stmt (bsi); if (TREE_CODE (stmt) != LABEL_EXPR) break; if (!DECL_ARTIFICIAL (LABEL_EXPR_LABEL (stmt))) @@ -2451,12 +2451,12 @@ is_ctrl_stmt (const_tree t) (e.g., a call to a non-returning function). */ bool -is_ctrl_altering_stmt (tree t) +is_ctrl_altering_stmt (const_tree t) { - tree call; + const_tree call; gcc_assert (t); - call = get_call_expr_in (t); + call = const_get_call_expr_in (t); if (call) { /* A non-pure/const CALL_EXPR alters flow control if the current @@ -2558,7 +2558,7 @@ stmt_starts_bb_p (const_tree t, const_tree prev_t) /* Return true if T should end a basic block. */ bool -stmt_ends_bb_p (tree t) +stmt_ends_bb_p (const_tree t) { return is_ctrl_stmt (t) || is_ctrl_altering_stmt (t); } @@ -4860,7 +4860,7 @@ tree_redirect_edge_and_branch (edge e, basic_block dest) it to the destination of the other edge from E->src. */ static bool -tree_can_remove_branch_p (edge e) +tree_can_remove_branch_p (const_edge e) { if (e->flags & EDGE_ABNORMAL) return false; @@ -4956,7 +4956,7 @@ tree_move_block_after (basic_block bb, basic_block after) /* Return true if basic_block can be duplicated. */ static bool -tree_can_duplicate_bb_p (basic_block bb ATTRIBUTE_UNUSED) +tree_can_duplicate_bb_p (const_basic_block bb ATTRIBUTE_UNUSED) { return true; } @@ -5917,10 +5917,10 @@ debug_loop_ir (void) otherwise. */ static bool -tree_block_ends_with_call_p (basic_block bb) +tree_block_ends_with_call_p (const_basic_block bb) { - block_stmt_iterator bsi = bsi_last (bb); - return get_call_expr_in (bsi_stmt (bsi)) != NULL; + const_block_stmt_iterator bsi = cbsi_last (bb); + return const_get_call_expr_in (cbsi_stmt (bsi)) != NULL; } @@ -5928,9 +5928,9 @@ tree_block_ends_with_call_p (basic_block bb) otherwise. */ static bool -tree_block_ends_with_condjump_p (basic_block bb) +tree_block_ends_with_condjump_p (const_basic_block bb) { - tree stmt = last_stmt (bb); + const_tree stmt = const_last_stmt (bb); return (stmt && TREE_CODE (stmt) == COND_EXPR); } -- cgit v1.1