From 6d522731379693a5107328079b804ecd2fbd4766 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 21 Jun 2017 12:59:12 +0200 Subject: [PATCH] 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 --- libcpp/ChangeLog | 8 ++++++++ libcpp/line-map.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 9665f6e16c9..526b8023b38 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,11 @@ +2017-06-21 Jakub Jelinek + + * 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. + 2017-06-20 David Malcolm * include/line-map.h (class rich_location): Document that attempts diff --git a/libcpp/line-map.c b/libcpp/line-map.c index 7ba003add98..476a465efa0 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