diff options
| author | Martin Liska <mliska@suse.cz> | 2022-07-12 13:23:53 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-07-12 13:23:53 +0200 |
| commit | b9dc4e9c94877b52037f2bd4eb01b5d179e41a43 (patch) | |
| tree | 11152b01244ee927fbf5460e08a200e03be0fdf5 /libcpp | |
| parent | c9de7a601878148247a44c4b04f550daa27cd556 (diff) | |
| parent | 220bef460153a0296e947f16492d35e67b1b5b22 (diff) | |
| download | gcc-b9dc4e9c94877b52037f2bd4eb01b5d179e41a43.zip gcc-b9dc4e9c94877b52037f2bd4eb01b5d179e41a43.tar.gz gcc-b9dc4e9c94877b52037f2bd4eb01b5d179e41a43.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/directives.cc | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 6b883a0..1a211f32 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2022-07-10 Lewis Hyatt <lhyatt@gmail.com> + + PR preprocessor/97498 + * directives.cc (destringize_and_run): Override the location of + the CPP_PRAGMA token from a _Pragma directive to the location of + the expansion point, as is done for the tokens lexed from it. + 2022-07-07 David Malcolm <dmalcolm@redhat.com> * include/line-map.h: Include <utility>. diff --git a/libcpp/directives.cc b/libcpp/directives.cc index f804a44..4104d51 100644 --- a/libcpp/directives.cc +++ b/libcpp/directives.cc @@ -1930,6 +1930,7 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in, maxcount = 50; toks = XNEWVEC (cpp_token, maxcount); toks[0] = pfile->directive_result; + toks[0].src_loc = expansion_loc; do { |