mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 02:44:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree-cfg: Fix call to next_discriminator_for_locus()

Browse Source 
While testing future 64-bit location_t support, I ran into an
-fcompare-debug issue that was traced back here. Despite the name,
next_discriminator_for_locus() is meant to take an integer line number
argument, not a location_t. There is one call site which has been passing a
location_t instead. For the most part that is harmless, although in case
there are two CALL stmts on the same line with different location_t, it may
fail to generate a unique discriminator where it should. If/when location_t
changes to be 64-bit, however, it will produce an -fcompare-debug
failure. Fix it by passing the line number rather than the location_t.

I am not aware of a testcase that demonstrates any observable wrong
behavior, but the file debug/pr53466.C is an example where the discriminator
assignment is indeed different before and after this change.

gcc/ChangeLog:

	* tree-cfg.cc (assign_discriminators): Fix incorrect value passed to
	next_discriminator_for_locus().
This commit is contained in:
Lewis Hyatt 2024-10-25 14:55:09 -04:00 committed by Lewis Hyatt
parent 26f3efccaa
commit 81c29232b6
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/tree-cfg.cc
View File

@ -1251,7 +1251,7 @@ assign_discriminators (void)
}
/* Allocate a new discriminator for CALL stmt. */
if (gimple_code (stmt) == GIMPLE_CALL)
curr_discr = next_discriminator_for_locus (curr_locus);
curr_discr = next_discriminator_for_locus (curr_locus_e.line);
}
gimple *last = last_nondebug_stmt (bb);