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

re PR c/66415 (ice in location_column_from_byte_offset) 

PR c/66415
	* c-format.c (location_from_offset): Return LOC if LINE is null.

	* line-map.c (linemap_position_for_loc_and_offset): Remove
	linemap_assert_fails; reverse conditions.

	* gcc.dg/cpp/pr66415-1.c: New test.
	* gcc.dg/cpp/pr66415-2.c: New test.

From-SVN: r224236
This commit is contained in:
Marek Polacek 2015-06-08 15:16:12 +00:00 committed by Marek Polacek
parent ad3e2ba074
commit a1661b90dc
7 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/c-family/ChangeLog
View File

@ -1,3 +1,8 @@
2015-06-08 Marek Polacek <polacek@redhat.com>
PR c/66415
* c-format.c (location_from_offset): Return LOC if LINE is null.
2015-06-05 Aldy Hernandez <aldyh@redhat.com>
* c-common.h (c_parse_final_cleanups): New prototype.

4
gcc/c-family/c-format.c
View File

@ -138,9 +138,11 @@ location_from_offset (location_t loc, int offset)
expanded_location s = expand_location_to_spelling_point (loc);
int line_width;
const char *line = location_get_source_line (s, &line_width);
if (line == NULL)
return loc;
line += s.column - 1 ;
line_width -= s.column - 1;
unsigned int column =
unsigned int column =
location_column_from_byte_offset (line, line_width, (unsigned) offset);
return linemap_position_for_loc_and_offset (line_table, loc, column);

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2015-06-08 Marek Polacek <polacek@redhat.com>
PR c/66415
* gcc.dg/cpp/pr66415-1.c: New test.
* gcc.dg/cpp/pr66415-2.c: New test.
2015-06-08 Richard Biener <rguenther@suse.de>
PR tree-optimization/66422

9
gcc/testsuite/gcc.dg/cpp/pr66415-1.c Normal file
View File

@ -0,0 +1,9 @@
/* PR c/66415 */
/* { dg-do compile } */
/* { dg-options "-Wformat" } */
void
fn1 (void)
{
__builtin_printf ("xxxxxxxxxxxxxxxxx%dxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); /* { dg-warning "format" } */
}

11
gcc/testsuite/gcc.dg/cpp/pr66415-2.c Normal file
View File

@ -0,0 +1,11 @@
/* PR c/66415 */
/* { dg-do compile } */
/* { dg-options "-Wformat" } */
#24
void
fn1 (void)
{
__builtin_printf ("xxxxxxxxxxxxxxxxx%dxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
/* { dg-warning "format" "" { target *-*-* } 27 } */
}

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2015-06-08 Marek Polacek <polacek@redhat.com>
PR c/66415
* line-map.c (linemap_position_for_loc_and_offset): Remove
linemap_assert_fails; reverse conditions.
2015-05-26 Manuel López-Ibáñez <manu@gcc.gnu.org>
* line-map.c (LINE_MAP_MAX_COLUMN_NUMBER

8
libcpp/line-map.c
View File

@ -688,15 +688,17 @@ linemap_position_for_loc_and_offset (struct line_maps *set,
/* We find the real location and shift it. */
loc = linemap_resolve_location (set, loc, LRK_SPELLING_LOCATION, &map);
/* The new location (loc + offset) should be higher than the first
location encoded by MAP. */
if (linemap_assert_fails (MAP_START_LOCATION (map) < loc + offset))
location encoded by MAP.
FIXME: We used to linemap_assert_fails here and in the if below,
but that led to PR66415. So give up for now. */
if ((MAP_START_LOCATION (map) >= loc + offset))
return loc;
/* If MAP is not the last line map of its set, then the new location
(loc + offset) should be less than the first location encoded by
the next line map of the set. */
if (map != LINEMAPS_LAST_ORDINARY_MAP (set))
if (linemap_assert_fails (loc + offset < MAP_START_LOCATION (&map[1])))
if ((loc + offset >= MAP_START_LOCATION (&map[1])))
return loc;
offset += SOURCE_COLUMN (map, loc);