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

[preprocessor/91991] column location overflow 

https://gcc.gnu.org/ml/gcc-patches/2019-10/msg00371.html
	PR preprocessor/91991
	* line-map.c (linemap_line_start): Clear max_column_hint if we run
	out of locations.

From-SVN: r276596
This commit is contained in:
Nathan Sidwell 2019-10-04 19:08:09 +00:00 committed by Nathan Sidwell
parent 2066f7951c
commit 924b927658
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2019-10-04 Nathan Sidwell <nathan@acm.org>
PR preprocessor/91991
* line-map.c (linemap_line_start): Clear max_column_hint if we run
out of locations.
2019-10-02 Richard Biener <rguenther@suse.de>
* internal.h (enum include_type): Remove trailing comma.

8
libcpp/line-map.c
View File

@ -717,11 +717,11 @@ linemap_line_start (line_maps *set, linenum_type to_line,
/* If the column number is ridiculous or we've allocated a huge
number of location_ts, give up on column numbers
(and on packed ranges). */
max_column_hint = 0;
max_column_hint = 1;
column_bits = 0;
range_bits = 0;
if (highest >= LINE_MAP_MAX_LOCATION)
return 0;
goto overflowed;
}
else
{
@ -735,6 +735,7 @@ linemap_line_start (line_maps *set, linenum_type to_line,
max_column_hint = 1U << column_bits;
column_bits += range_bits;
}
/* Allocate the new line_map. However, if the current map only has a
single line we can sometimes just increase its column_bits instead. */
if (line_delta < 0
@ -765,8 +766,11 @@ linemap_line_start (line_maps *set, linenum_type to_line,
macro tokens. */
if (r >= LINE_MAP_MAX_LOCATION)
{
overflowed:
/* Remember we overflowed. */
set->highest_line = set->highest_location = LINE_MAP_MAX_LOCATION - 1;
/* No column numbers! */
set->max_column_hint = 1;
return 0;
}