From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1285) id 3FE533854832; Tue, 13 Apr 2021 12:04:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3FE533854832 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Eric Botcazou To: gcc-cvs@gcc.gnu.org Subject: [gcc r9-9346] Fix thinko in libcpp preparation patch for modules X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: beec602b7890919dea3a8fb256ffc38043c3ff53 X-Git-Newrev: e268afb4a89d172244ef46d999be97b1dd8343d8 Message-Id: <20210413120437.3FE533854832@sourceware.org> Date: Tue, 13 Apr 2021 12:04:37 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 12:04:37 -0000 https://gcc.gnu.org/g:e268afb4a89d172244ef46d999be97b1dd8343d8 commit r9-9346-ge268afb4a89d172244ef46d999be97b1dd8343d8 Author: Eric Botcazou Date: Tue Apr 13 11:57:55 2021 +0200 Fix thinko in libcpp preparation patch for modules The problem is that the new IS_MACRO_LOC macro: inline bool IS_MACRO_LOC (location_t loc) { return !IS_ORDINARY_LOC (loc) && !IS_ADHOC_LOC (loc); } is not fully correct since the position of the macro lines is not fixed: /* Returns the lowest location [of a token resulting from macro expansion] encoded in this line table. */ inline location_t LINEMAPS_MACRO_LOWEST_LOCATION (const line_maps *set) { return LINEMAPS_MACRO_USED (set) ? MAP_START_LOCATION (LINEMAPS_LAST_MACRO_MAP (set)) : MAX_LOCATION_T + 1; } In Ada, LINEMAPS_MACRO_USED is false so LINEMAPS_MACRO_LOWEST_LOCATION is MAX_LOCATION_T + 1, but IS_MACRO_LOC nevertheless returns true for anything in the range [LINE_MAP_MAX_LOCATION; MAX_LOCATION_T], thus yielding an ICE in linemap_macro_map_lookup for very large files. libcpp/ * include/line-map.h (IS_MACRO_LOC): Delete. * line-map.c (linemap_location_from_macro_expansion_p): Test LINEMAPS_MACRO_LOWEST_LOCATION of the linemap. Diff: --- libcpp/include/line-map.h | 10 +++------- libcpp/line-map.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 6c77c288855..51db65e5247 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -561,7 +561,7 @@ struct GTY((tag ("2"))) line_map_macro : public line_map { #define linemap_assert_fails(EXPR) (! (EXPR)) #endif -/* Get whether location LOC is an ad-hoc, ordinary or macro location. */ +/* Get whether location LOC is an ordinary location. */ inline bool IS_ORDINARY_LOC (location_t loc) @@ -569,18 +569,14 @@ IS_ORDINARY_LOC (location_t loc) return loc < LINE_MAP_MAX_LOCATION; } +/* Get whether location LOC is an ad-hoc location. */ + inline bool IS_ADHOC_LOC (location_t loc) { return loc > MAX_LOCATION_T; } -inline bool -IS_MACRO_LOC (location_t loc) -{ - return !IS_ORDINARY_LOC (loc) && !IS_ADHOC_LOC (loc); -} - /* Categorize line map kinds. */ inline bool diff --git a/libcpp/line-map.c b/libcpp/line-map.c index b73f5067c24..6b5c36524ee 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -1243,7 +1243,7 @@ linemap_location_from_macro_expansion_p (const struct line_maps *set, location = set->location_adhoc_data_map.data[location & MAX_LOCATION_T].locus; - return IS_MACRO_LOC (location); + return location >= LINEMAPS_MACRO_LOWEST_LOCATION (set); } /* Given two virtual locations *LOC0 and *LOC1, return the first