diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-11-04 13:22:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 13:22:10 +0000 |
| commit | 0a59abbfc74c3961fb01323d9fbff8427518fde6 (patch) | |
| tree | b17389116bc4da1d022345b7b78eb6fc0fbe4eb0 /libcpp/include/line-map.h | |
| parent | f8c2fab0c6c11f73fdcb1eb31e8b5b75c2fdbf7f (diff) | |
| parent | a7b70c704182db2defd0c0f991c16f4d9219bc2f (diff) | |
| download | gcc-0a59abbfc74c3961fb01323d9fbff8427518fde6.zip gcc-0a59abbfc74c3961fb01323d9fbff8427518fde6.tar.gz gcc-0a59abbfc74c3961fb01323d9fbff8427518fde6.tar.bz2 | |
Merge #1627
1627: Merge GCC mainline/master into gccrs/master r=CohenArthur a=ibuclaw
`@doko42` was asking, so here's another merge sync.
Co-authored-by: GCC Administrator <gccadmin@gcc.gnu.org>
Co-authored-by: Andrew MacLeod <amacleod@redhat.com>
Co-authored-by: Liwei Xu <liwei.xu@intel.com>
Co-authored-by: Richard Biener <rguenther@suse.de>
Co-authored-by: Jakub Jelinek <jakub@redhat.com>
Co-authored-by: Andre Vieira <andre.simoesdiasvieira@arm.com>
Co-authored-by: Jonathan Wakely <jwakely@redhat.com>
Co-authored-by: Martin Jambor <mjambor@suse.cz>
Co-authored-by: Joseph Myers <joseph@codesourcery.com>
Co-authored-by: Patrick Palka <ppalka@redhat.com>
Co-authored-by: Florian Weimer <fweimer@redhat.com>
Co-authored-by: Marek Polacek <polacek@redhat.com>
Co-authored-by: liuhongt <hongtao.liu@intel.com>
Co-authored-by: Martin Liska <mliska@suse.cz>
Co-authored-by: Robin Dapp <rdapp@linux.ibm.com>
Co-authored-by: Takayuki 'January June' Suwa <jjsuwa_sys3175@yahoo.co.jp>
Co-authored-by: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
Diffstat (limited to 'libcpp/include/line-map.h')
| -rw-r--r-- | libcpp/include/line-map.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 9bdd5b9..50207ca 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -757,6 +757,7 @@ struct GTY(()) location_adhoc_data { location_t locus; source_range src_range; void * GTY((skip)) data; + unsigned discriminator; }; struct htab; @@ -1034,12 +1035,14 @@ LINEMAPS_LAST_ALLOCATED_MACRO_MAP (const line_maps *set) } extern location_t get_combined_adhoc_loc (line_maps *, location_t, - source_range, void *); + source_range, void *, unsigned); extern void *get_data_from_adhoc_loc (const line_maps *, location_t); +extern unsigned get_discriminator_from_adhoc_loc (const line_maps *, location_t); extern location_t get_location_from_adhoc_loc (const line_maps *, location_t); extern source_range get_range_from_loc (line_maps *set, location_t loc); +extern unsigned get_discriminator_from_loc (line_maps *set, location_t loc); /* Get whether location LOC is a "pure" location, or whether it is an ad-hoc location, or embeds range information. */ @@ -1058,9 +1061,10 @@ inline location_t COMBINE_LOCATION_DATA (class line_maps *set, location_t loc, source_range src_range, - void *block) + void *block, + unsigned discriminator) { - return get_combined_adhoc_loc (set, loc, src_range, block); + return get_combined_adhoc_loc (set, loc, src_range, block, discriminator); } extern void rebuild_location_adhoc_htab (class line_maps *); |