mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-13 09:24:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR preprocessor/53469 - argument tokens of _Pragma miss virtual location

Browse Source 
Consider this short test snippet:

-------------------------8-------------------
    #define STRINGIFY(x) #x
    #define TEST(x) \
      _Pragma(STRINGIFY(GCC diagnostic ignored "-Wunused-local-typedefs")) \
      typedef int myint;

    void bar ()
    {
      TEST(myint)
    }
-------------------------8-------------------

The _Pragma is effectively ignored, and compiling with
-Wunused-local-typedefs warns on the local typedef, even though the
pragma should have prevented the warning to be emitted.

This is because when the preprocessor sees the _Pragma operator and
then goes to handle the first token ('GCC' here) that makes up its
operands, it retains the spelling location of that token, not its
virtual location.

Later when diagnostic_report_diagnostic is called to emit the warning
(or ignore it because of the pragma), it compares the location of the
first operand of the pragma with the location of the unused location,
(by calling linemap_location_before_p) and that comparison fails
because in this case, both locations should be virtual.

This patch fixes the issue by teaching the pragma handling to use
virtual locations.

Bootstrapped and tested on x86_64-unknown-linux-gnu against trunk.

libcpp/

	PR preprocessor/53469
	* directives.c (do_pragma): Use the virtual location for the
	pragma token, instead of its spelling location.

gcc/testsuite/

	PR preprocessor/53469
	* gcc.dg/cpp/_Pragma7.c: New test case.

From-SVN: r190714
This commit is contained in:
Dodji Seketeli 2012-08-27 15:41:38 +00:00 committed by Dodji Seketeli
parent c0782a4002
commit f3d25c6570
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-05-25 Dodji Seketeli <dodji@redhat.com>
PR preprocessor/53469
* gcc.dg/cpp/_Pragma7.c: New test case.
2012-08-27 Tobias Burnus <burnus@net-b.de>
PR fortran/54370

14
gcc/testsuite/gcc.dg/cpp/_Pragma7.c Normal file
View File

@ -0,0 +1,14 @@
/*
Origin: PR preprocessor/53469
{ dg-do compile }
*/
#define STRINGIFY(x) #x
#define TEST(x) \
_Pragma(STRINGIFY(GCC diagnostic ignored "-Wunused-local-typedefs")) \
typedef int myint;
void bar ()
{
TEST(myint)
}

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-25 Dodji Seketeli <dodji@redhat.com>
PR preprocessor/53469
* directives.c (do_pragma): Use the virtual location for the
pragma token, instead of its spelling location.
2012-08-14 Diego Novillo <dnovillo@google.com>
Merge from cxx-conversion branch. Configury.

8
libcpp/directives.c
View File

@ -1347,13 +1347,15 @@ static void
do_pragma (cpp_reader *pfile)
{
const struct pragma_entry *p = NULL;
const cpp_token *token, *pragma_token = pfile->cur_token;
const cpp_token *token, *pragma_token;
source_location pragma_token_virt_loc = 0;
cpp_token ns_token;
unsigned int count = 1;
pfile->state.prevent_expansion++;
token = cpp_get_token (pfile);
pragma_token = token = cpp_get_token_with_location (pfile,
&pragma_token_virt_loc);
ns_token = *token;
if (token->type == CPP_NAME)
{
@ -1379,7 +1381,7 @@ do_pragma (cpp_reader *pfile)
{
if (p->is_deferred)
{
pfile->directive_result.src_loc = pragma_token->src_loc;
pfile->directive_result.src_loc = pragma_token_virt_loc;
pfile->directive_result.type = CPP_PRAGMA;
pfile->directive_result.flags = pragma_token->flags;
pfile->directive_result.val.pragma = p->u.ident;