diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/pr66415-1.c | 2 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/line-map.c | 34 |
4 files changed, 32 insertions, 15 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5eaceca..61c3b96 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-09-21 Manuel López-Ibáñez <manu@gcc.gnu.org> + + PR c/66415 + * gcc.dg/cpp/pr66415-1.c: Test column number. + 2015-09-21 Richard Biener <rguenther@suse.de> * g++.dg/ext/attr-alias-3.C: Add -g. diff --git a/gcc/testsuite/gcc.dg/cpp/pr66415-1.c b/gcc/testsuite/gcc.dg/cpp/pr66415-1.c index 922e326..349ec48 100644 --- a/gcc/testsuite/gcc.dg/cpp/pr66415-1.c +++ b/gcc/testsuite/gcc.dg/cpp/pr66415-1.c @@ -5,5 +5,5 @@ void fn1 (void) { - __builtin_printf ("xxxxxxxxxxxxxxxxx%dxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); /* { dg-warning "format" } */ + __builtin_printf ("xxxxxxxxxxxxxxxxx%dxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); /* { dg-warning "71:format" } */ } diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 3173bf5..5cb23d0 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2015-09-21 Manuel López-Ibáñez <manu@gcc.gnu.org> + + PR c/66415 + * line-map.c (linemap_position_for_loc_and_offset): Handle the + case of long lines encoded in multiple maps. + 2015-09-07 Marek Polacek <polacek@redhat.com> * system.h (INTTYPE_MINIMUM): Rewrite to avoid shift warning. diff --git a/libcpp/line-map.c b/libcpp/line-map.c index d58cad2..3d82e9b 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -688,28 +688,34 @@ 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. - 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)) + location encoded by MAP. This can fail if the line information + is messed up because of line directives (see PR66415). */ + if (MAP_START_LOCATION (map) >= loc + offset) return loc; + linenum_type line = SOURCE_LINE (map, loc); + unsigned int column = SOURCE_COLUMN (map, 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 ((loc + offset >= MAP_START_LOCATION (&map[1]))) - return loc; + the next line map of the set. Otherwise, we try to encode the + location in the next map. */ + while (map != LINEMAPS_LAST_ORDINARY_MAP (set) + && loc + offset >= MAP_START_LOCATION (&map[1])) + { + map = &map[1]; + /* If the next map starts in a higher line, we cannot encode the + location there. */ + if (line < ORDINARY_MAP_STARTING_LINE_NUMBER (map)) + return loc; + } - offset += SOURCE_COLUMN (map, loc); - if (linemap_assert_fails - (offset < (1u << map->column_bits))) + offset += column; + if (linemap_assert_fails (offset < (1u << map->column_bits))) return loc; source_location r = - linemap_position_for_line_and_column (map, - SOURCE_LINE (map, loc), - offset); + linemap_position_for_line_and_column (map, line, offset); if (linemap_assert_fails (r <= set->highest_location) || linemap_assert_fails (map == linemap_lookup (set, r))) return loc; |