[PATCH] preprocessor/100142 - revert unwanted change in last commit

Richard Biener rguenther@suse.de
Mon Apr 19 08:10:34 GMT 2021


This reverts a s/column_offset/column/ change in the fix for PR99446.

Boostrapped on x86_64-unknown-linux-gnu, testing in progress.

OK for trunk?

Thanks,
Richard.

2021-04-19  Richard Biener  <rguenther@suse.de>

	PR preprocessor/100142
libcpp/
	* line-map.c (linemap_position_for_loc_and_offset): Revert
	unintended s/column_offset/column/ change.

	* gcc.dg/pr100142.c: New testcase.
---
 libcpp/line-map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcpp/line-map.c b/libcpp/line-map.c
index 2f5e44447d2..a03d6760a8e 100644
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.c
@@ -982,7 +982,7 @@ linemap_position_for_loc_and_offset (line_maps *set,
      the next line map of the set.  Otherwise, we try to encode the
      location in the next map.  */
   for (; map != LINEMAPS_LAST_ORDINARY_MAP (set)
-	 && (loc + (column << map->m_range_bits)
+	 && (loc + (column_offset << map->m_range_bits)
 	     >= MAP_START_LOCATION (map + 1)); map++)
     /* If the next map is a different file, or starts in a higher line, we
        cannot encode the location there.  */
-- 
2.26.2


More information about the Gcc-patches mailing list