diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-06-21 12:59:12 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-06-21 12:59:12 +0200 |
| commit | 6d522731379693a5107328079b804ecd2fbd4766 (patch) | |
| tree | cf6543870e2daf6ed7988acd197536ef1d848eb1 /libcpp/line-map.c | |
| parent | d54d1fc3bcd2d3dda563f9bd95b60299bc892041 (diff) | |
| download | gcc-6d522731379693a5107328079b804ecd2fbd4766.zip gcc-6d522731379693a5107328079b804ecd2fbd4766.tar.gz gcc-6d522731379693a5107328079b804ecd2fbd4766.tar.bz2 | |
line-map.c (location_adhoc_data_update): Perform addition in uintptr_t type rather than char * type.
* line-map.c (location_adhoc_data_update): Perform addition in
uintptr_t type rather than char * type. Read *data using
ptrdiff_t type instead of int64_t.
(get_combined_adhoc_loc): Change offset type to ptrdiff_t from
int64_t.
From-SVN: r249446
Diffstat (limited to 'libcpp/line-map.c')
| -rw-r--r-- | libcpp/line-map.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcpp/line-map.c b/libcpp/line-map.c index 7ba003a..476a465 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -99,7 +99,8 @@ location_adhoc_data_eq (const void *l1, const void *l2) static int location_adhoc_data_update (void **slot, void *data) { - *((char **) slot) += *((int64_t *) data); + *((char **) slot) + = (char *) ((uintptr_t) *((char **) slot) + *((ptrdiff_t *) data)); return 1; } @@ -221,7 +222,7 @@ get_combined_adhoc_loc (struct line_maps *set, set->location_adhoc_data_map.allocated) { char *orig_data = (char *) set->location_adhoc_data_map.data; - int64_t offset; + ptrdiff_t offset; /* Cast away extern "C" from the type of xrealloc. */ line_map_realloc reallocator = (set->reallocator ? set->reallocator |