OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cfghooks.c (split_block): Copy discriminator to new block. 

* cfghooks.c (split_block): Copy discriminator to new block.
	* tree-cfg.c (assign_discriminator): Check location of last
	instruction in block as well as first.

From-SVN: r150065
This commit is contained in:
Cary Coutant 2009-07-24 22:37:05 +00:00 committed by Cary Coutant
parent 2e0814c8d6
commit cbea518e5b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2009-07-24 Cary Coutant <ccoutant@google.com>
* cfghooks.c (split_block): Copy discriminator to new block.
* tree-cfg.c (assign_discriminator): Check location of last
instruction in block as well as first.
2009-07-24 Uros Bizjak <ubizjak@gmail.com>
* config/i386/linux.c: Use fputs or putc instead of fprintf

1
gcc/cfghooks.c
View File

@ -437,6 +437,7 @@ split_block (basic_block bb, void *i)
new_bb->count = bb->count;
new_bb->frequency = bb->frequency;
new_bb->loop_depth = bb->loop_depth;
new_bb->discriminator = bb->discriminator;
if (dom_info_available_p (CDI_DOMINATORS))
{

8
gcc/tree-cfg.c
View File

@ -756,13 +756,15 @@ same_line_p (location_t locus1, location_t locus2)
static void
assign_discriminator (location_t locus, basic_block bb)
{
gimple to_stmt;
gimple first_in_to_bb, last_in_to_bb;
if (locus == 0 || bb->discriminator != 0)
return;
to_stmt = first_non_label_stmt (bb);
if (to_stmt && same_line_p (locus, gimple_location (to_stmt)))
first_in_to_bb = first_non_label_stmt (bb);
last_in_to_bb = last_stmt (bb);
if (first_in_to_bb && same_line_p (locus, gimple_location (first_in_to_bb))
|| last_in_to_bb && same_line_p (locus, gimple_location (last_in_to_bb)))
bb->discriminator = next_discriminator_for_locus (locus);
}