diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2016-01-27 18:57:51 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2016-01-27 18:57:51 +0000 |
| commit | 0afff540e652c77b409ce094f64cc2b033495785 (patch) | |
| tree | f6cecd18c9211abd83605d0385a9448c4f50e786 /libcpp/directives.c | |
| parent | b45285fc2ee430b675f57e8c92310aaf77ba031e (diff) | |
| download | gcc-0afff540e652c77b409ce094f64cc2b033495785.zip gcc-0afff540e652c77b409ce094f64cc2b033495785.tar.gz gcc-0afff540e652c77b409ce094f64cc2b033495785.tar.bz2 | |
libcpp: use better locations for _Pragma tokens (preprocessor/69126)
gcc/testsuite/ChangeLog:
PR preprocessor/69126
* c-c++-common/pr69126.c: New test case.
libcpp/ChangeLog:
PR preprocessor/69126
* directives.c (destringize_and_run): Add expansion_loc param; use
it when handling unexpanded pragmas to fixup the locations of the
synthesized tokens.
(_cpp_do__Pragma): Add expansion_loc param and use it when calling
destringize_and_run.
* internal.h (_cpp_do__Pragma): Add expansion_loc param.
* macro.c (builtin_macro): Pass expansion location of _Pragma to
_cpp_do__Pragma.
From-SVN: r232893
Diffstat (limited to 'libcpp/directives.c')
| -rw-r--r-- | libcpp/directives.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libcpp/directives.c b/libcpp/directives.c index eff1861..a1e1239 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -1753,7 +1753,8 @@ get__Pragma_string (cpp_reader *pfile) /* Destringize IN into a temporary buffer, by removing the first \ of \" and \\ sequences, and process the result as a #pragma directive. */ static void -destringize_and_run (cpp_reader *pfile, const cpp_string *in) +destringize_and_run (cpp_reader *pfile, const cpp_string *in, + source_location expansion_loc) { const unsigned char *src, *limit; char *dest, *result; @@ -1833,6 +1834,12 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in) toks = XRESIZEVEC (cpp_token, toks, maxcount); } toks[count] = *cpp_get_token (pfile); + /* _Pragma is a builtin, so we're not within a macro-map, and so + the token locations are set to bogus ordinary locations + near to, but after that of the "_Pragma". + Paper over this by setting them equal to the location of the + _Pragma itself (PR preprocessor/69126). */ + toks[count].src_loc = expansion_loc; /* Macros have been already expanded by cpp_get_token if the pragma allowed expansion. */ toks[count++].flags |= NO_EXPAND; @@ -1867,14 +1874,14 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in) /* Handle the _Pragma operator. Return 0 on error, 1 if ok. */ int -_cpp_do__Pragma (cpp_reader *pfile) +_cpp_do__Pragma (cpp_reader *pfile, source_location expansion_loc) { const cpp_token *string = get__Pragma_string (pfile); pfile->directive_result.type = CPP_PADDING; if (string) { - destringize_and_run (pfile, &string->val.str); + destringize_and_run (pfile, &string->val.str, expansion_loc); return 1; } cpp_error (pfile, CPP_DL_ERROR, |