Remove dont_emit_block_notes
Richard Henderson
rth@redhat.com
Thu Jul 1 08:01:00 GMT 2004
Now that rest_of_compilation is not called, this is always true.
r~
* function.h (struct function): Remove dont_emit_block_notes.
* gimple-low.c (lower_function_body): Don't set it.
* cfgexpand.c (expand_block): Don't check it.
* cfglayout.c (insn_locators_initialize): Likewise.
* expr.c (expand_expr_real, expand_expr_real_1): Likewise.
* passes.c (rest_of_compilation): Likewise.
* stmt.c (expand_start_bindings_and_block): Likewise.
(expand_end_bindings): Likewise.
Index: cfgexpand.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfgexpand.c,v
retrieving revision 2.4
diff -c -p -d -u -r2.4 cfgexpand.c
--- cfgexpand.c 1 Jul 2004 00:38:36 -0000 2.4
+++ cfgexpand.c 1 Jul 2004 07:57:09 -0000
@@ -119,8 +119,7 @@ expand_block (basic_block bb, FILE * dum
if (EXPR_LOCUS (stmt))
{
emit_line_note (*(EXPR_LOCUS (stmt)));
- if (cfun->dont_emit_block_notes)
- record_block_change (TREE_BLOCK (stmt));
+ record_block_change (TREE_BLOCK (stmt));
}
/* These flags have no purpose in RTL land. */
Index: cfglayout.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfglayout.c,v
retrieving revision 1.64
diff -c -p -d -u -r1.64 cfglayout.c
--- cfglayout.c 30 Jun 2004 18:17:49 -0000 1.64
+++ cfglayout.c 1 Jul 2004 07:57:09 -0000
@@ -308,19 +308,9 @@ insn_locators_initialize (void)
switch (NOTE_LINE_NUMBER (insn))
{
case NOTE_INSN_BLOCK_BEG:
- if (cfun->dont_emit_block_notes)
- abort ();
- block = NOTE_BLOCK (insn);
- delete_insn (insn);
- break;
case NOTE_INSN_BLOCK_END:
- if (cfun->dont_emit_block_notes)
- abort ();
- block = BLOCK_SUPERCONTEXT (block);
- if (block && TREE_CODE (block) == FUNCTION_DECL)
- block = 0;
- delete_insn (insn);
- break;
+ abort ();
+
default:
if (NOTE_LINE_NUMBER (insn) > 0)
{
@@ -333,16 +323,14 @@ insn_locators_initialize (void)
}
}
- if (cfun->dont_emit_block_notes)
- check_block_change (insn, &block);
+ check_block_change (insn, &block);
}
/* Tag the blocks with a depth number so that change_scope can find
the common parent easily. */
set_block_levels (DECL_INITIAL (cfun->decl), 0);
- if (cfun->dont_emit_block_notes)
- free_block_changes ();
+ free_block_changes ();
}
/* For each lexical block, set BLOCK_NUMBER to the depth at which it is
Index: expr.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/expr.c,v
retrieving revision 1.658
diff -c -p -d -u -r1.658 expr.c
--- expr.c 30 Jun 2004 10:09:50 -0000 1.658
+++ expr.c 1 Jul 2004 07:57:10 -0000
@@ -6490,8 +6490,7 @@ expand_expr_real (tree exp, rtx target,
emit_line_note (input_location);
/* Record where the insns produced belong. */
- if (cfun->dont_emit_block_notes)
- record_block_change (TREE_BLOCK (exp));
+ record_block_change (TREE_BLOCK (exp));
ret = expand_expr_real_1 (exp, target, tmode, modifier, alt_rtl);
@@ -8534,8 +8533,7 @@ expand_expr_real_1 (tree exp, rtx target
if (EXPR_HAS_LOCATION (exp))
{
emit_line_note (EXPR_LOCATION (exp));
- if (cfun->dont_emit_block_notes)
- record_block_change (TREE_BLOCK (exp));
+ record_block_change (TREE_BLOCK (exp));
}
expand_elseif (TREE_OPERAND (exp, 0));
expand_expr (TREE_OPERAND (exp, 1), const0_rtx, VOIDmode, 0);
Index: function.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/function.h,v
retrieving revision 1.121
diff -c -p -d -u -r1.121 function.h
--- function.h 1 Jul 2004 01:12:16 -0000 1.121
+++ function.h 1 Jul 2004 07:57:10 -0000
@@ -361,10 +361,6 @@ struct function GTY(())
delay list for them is recorded here. */
rtx epilogue_delay_list;
- /* Nonzero if NOTE_INSN_BLOCK_BEG / NOTE_INSN_BLOCK_END notes should not
- be emitted. */
- unsigned int dont_emit_block_notes : 1;
-
/* How commonly executed the function is. Initialized during branch
probabilities pass. */
enum function_frequency {
Index: gimple-low.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gimple-low.c,v
retrieving revision 2.7
diff -c -p -d -u -r2.7 gimple-low.c
--- gimple-low.c 30 Jun 2004 18:11:13 -0000 2.7
+++ gimple-low.c 1 Jul 2004 07:57:10 -0000
@@ -124,8 +124,6 @@ lower_function_body (void)
clear_block_marks (data.block);
- /* Avoid producing notes for blocks. */
- cfun->dont_emit_block_notes = 1;
reset_block_changes ();
}
Index: passes.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/passes.c,v
retrieving revision 2.25
diff -c -p -d -u -r2.25 passes.c
--- passes.c 1 Jul 2004 01:12:16 -0000 2.25
+++ passes.c 1 Jul 2004 07:57:10 -0000
@@ -1374,14 +1374,7 @@ rest_of_compilation (void)
have been run to re-initialize it. */
cse_not_expected = ! optimize;
- if (!cfun->dont_emit_block_notes)
- {
- /* In function-at-a-time mode, we do not attempt to keep the BLOCK
- tree in sensible shape. So, we just recalculate it here. */
- reorder_blocks ();
- }
- else
- finalize_block_changes ();
+ finalize_block_changes ();
/* Dump the rtl code if we are dumping rtl. */
if (open_dump_file (DFI_rtl, current_function_decl))
@@ -1413,8 +1406,6 @@ rest_of_compilation (void)
over the instruction sequence faster, and allow the garbage
collector to reclaim the memory used by the notes. */
remove_unnecessary_notes ();
- if (!cfun->dont_emit_block_notes)
- reorder_blocks ();
ggc_collect ();
Index: stmt.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/stmt.c,v
retrieving revision 1.364
diff -c -p -d -u -r1.364 stmt.c
--- stmt.c 1 Jul 2004 01:12:17 -0000 1.364
+++ stmt.c 1 Jul 2004 07:57:10 -0000
@@ -2840,13 +2840,7 @@ expand_start_bindings_and_block (int fla
abort ();
/* Create a note to mark the beginning of the block. */
- if (block_flag && !cfun->dont_emit_block_notes)
- {
- note = emit_note (NOTE_INSN_BLOCK_BEG);
- NOTE_BLOCK (note) = block;
- }
- else
- note = emit_note (NOTE_INSN_DELETED);
+ note = emit_note (NOTE_INSN_DELETED);
/* Make an entry on block_stack for the block we are entering. */
@@ -3073,7 +3067,8 @@ warn_about_unused_variables (tree vars)
labels (because the front end does that). */
void
-expand_end_bindings (tree vars, int mark_ends, int dont_jump_in)
+expand_end_bindings (tree vars, int mark_ends ATTRIBUTE_UNUSED,
+ int dont_jump_in)
{
struct nesting *thisblock = block_stack;
@@ -3165,14 +3160,8 @@ expand_end_bindings (tree vars, int mark
We do this now, after running cleanups on the variables
just going out of scope, so they are in scope for their cleanups. */
- if (mark_ends && !cfun->dont_emit_block_notes)
- {
- rtx note = emit_note (NOTE_INSN_BLOCK_END);
- NOTE_BLOCK (note) = NOTE_BLOCK (thisblock->data.block.first_insn);
- }
- else
- /* Get rid of the beginning-mark if we don't make an end-mark. */
- NOTE_LINE_NUMBER (thisblock->data.block.first_insn) = NOTE_INSN_DELETED;
+ /* Get rid of the beginning-mark if we don't make an end-mark. */
+ NOTE_LINE_NUMBER (thisblock->data.block.first_insn) = NOTE_INSN_DELETED;
/* Restore the temporary level of TARGET_EXPRs. */
target_temp_slot_level = thisblock->data.block.block_target_temp_slot_level;
More information about the Gcc-patches
mailing list