mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-15 02:50:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

If a pass occurs in several pass lists...

Browse Source 
If a pass occurs in several pass lists, like pass_cleanup_eh which occurs in
both all_small_ipa_passes and all_passes, make sure all instances of it are
considered for replacement/insertion when ref_pass_instance_number is zero,
not just the instance in the first pass list.

From-SVN: r156961
This commit is contained in:
Duncan Sands 2010-02-22 15:18:10 +01:00 committed by Duncan Sands
parent 9efc83f4ba
commit 669887fc19
2 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-22 Duncan Sands <baldrick@free.fr>
* passes.c (register_pass): Always consider all pass lists when
ref_pass_instance_number is zero.
2010-02-22 Richard Guenther <rguenther@suse.de> 2010-02-22 Richard Guenther <rguenther@suse.de>
PR tree-optimization/42749 PR tree-optimization/42749

76
gcc/passes.c
View File

@ -632,6 +632,8 @@ position_pass (struct register_pass_info *new_pass_info,
void void
register_pass (struct register_pass_info *pass_info) register_pass (struct register_pass_info *pass_info)
{ {
bool all_instances, success;
/* The checks below could fail in buggy plugins. Existing GCC /* The checks below could fail in buggy plugins. Existing GCC
passes should never fail these checks, so we mention plugin in passes should never fail these checks, so we mention plugin in
the messages. */ the messages. */
@ -647,46 +649,50 @@ register_pass (struct register_pass_info *pass_info)
pass_info->pass->name); pass_info->pass->name);
/* Try to insert the new pass to the pass lists. We need to check /* Try to insert the new pass to the pass lists. We need to check
all three lists as the reference pass could be in one (or all) of all five lists as the reference pass could be in one (or all) of
them. */ them. */
if (!position_pass (pass_info, &all_lowering_passes) all_instances = pass_info->ref_pass_instance_number == 0;
&& !position_pass (pass_info, &all_small_ipa_passes) success = position_pass (pass_info, &all_lowering_passes);
&& !position_pass (pass_info, &all_regular_ipa_passes) if (!success || all_instances)
&& !position_pass (pass_info, &all_lto_gen_passes) success |= position_pass (pass_info, &all_small_ipa_passes);
&& !position_pass (pass_info, &all_passes)) if (!success || all_instances)
success |= position_pass (pass_info, &all_regular_ipa_passes);
if (!success || all_instances)
success |= position_pass (pass_info, &all_lto_gen_passes);
if (!success || all_instances)
success |= position_pass (pass_info, &all_passes);
if (!success)
fatal_error fatal_error
("pass %qs not found but is referenced by new pass %qs", ("pass %qs not found but is referenced by new pass %qs",
pass_info->reference_pass_name, pass_info->pass->name); pass_info->reference_pass_name, pass_info->pass->name);
else
/* OK, we have successfully inserted the new pass. We need to register
the dump files for the newly added pass and its duplicates (if any).
Because the registration of plugin/backend passes happens after the
command-line options are parsed, the options that specify single
pass dumping (e.g. -fdump-tree-PASSNAME) cannot be used for new
passes. Therefore we currently can only enable dumping of
new passes when the 'dump-all' flags (e.g. -fdump-tree-all)
are specified. While doing so, we also delete the pass_list_node
objects created during pass positioning. */
while (added_pass_nodes)
{ {
/* OK, we have successfully inserted the new pass. We need to register struct pass_list_node *next_node = added_pass_nodes->next;
the dump files for the newly added pass and its duplicates (if any). enum tree_dump_index tdi;
Because the registration of plugin/backend passes happens after the register_one_dump_file (added_pass_nodes->pass);
command-line options are parsed, the options that specify single if (added_pass_nodes->pass->type == SIMPLE_IPA_PASS
pass dumping (e.g. -fdump-tree-PASSNAME) cannot be used for new || added_pass_nodes->pass->type == IPA_PASS)
passes. Therefore we currently can only enable dumping of tdi = TDI_ipa_all;
new passes when the 'dump-all' flags (e.g. -fdump-tree-all) else if (added_pass_nodes->pass->type == GIMPLE_PASS)
are specified. While doing so, we also delete the pass_list_node tdi = TDI_tree_all;
objects created during pass positioning. */ else
while (added_pass_nodes) tdi = TDI_rtl_all;
{ /* Check if dump-all flag is specified. */
struct pass_list_node *next_node = added_pass_nodes->next; if (get_dump_file_info (tdi)->state)
enum tree_dump_index tdi; get_dump_file_info (added_pass_nodes->pass->static_pass_number)
register_one_dump_file (added_pass_nodes->pass); ->state = get_dump_file_info (tdi)->state;
if (added_pass_nodes->pass->type == SIMPLE_IPA_PASS XDELETE (added_pass_nodes);
|| added_pass_nodes->pass->type == IPA_PASS) added_pass_nodes = next_node;
tdi = TDI_ipa_all;
else if (added_pass_nodes->pass->type == GIMPLE_PASS)
tdi = TDI_tree_all;
else
tdi = TDI_rtl_all;
/* Check if dump-all flag is specified. */
if (get_dump_file_info (tdi)->state)
get_dump_file_info (added_pass_nodes->pass->static_pass_number)
->state = get_dump_file_info (tdi)->state;
XDELETE (added_pass_nodes);
added_pass_nodes = next_node;
}
} }
} }