From 6b36694859ea9f0951f329d55b60ecc70dba0c8b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 21 Mar 2016 16:41:13 +0100 Subject: [PATCH] re PR target/70296 (Incorrect handling of vector X; if X is function-like macro) PR target/70296 * include/cpplib.h (cpp_fun_like_macro_p): New prototype. * macro.c (cpp_fun_like_macro_p): New function. * config/rs6000/rs6000-c.c (rs6000_macro_to_expand): If IDENT is function-like macro, peek following token(s) if it is followed by CPP_OPEN_PAREN token with optional padding in between, and if not, don't treat it like a macro. * gcc.target/powerpc/altivec-36.c: New test. From-SVN: r234371 --- gcc/ChangeLog | 8 ++++ gcc/config/rs6000/rs6000-c.c | 16 ++++++- gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/gcc.target/powerpc/altivec-36.c | 46 +++++++++++++++++++ libcpp/ChangeLog | 6 +++ libcpp/include/cpplib.h | 1 + libcpp/macro.c | 9 ++++ 7 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/powerpc/altivec-36.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b45acc50aa5..0bc45fd34e1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-03-21 Jakub Jelinek + + PR target/70296 + * config/rs6000/rs6000-c.c (rs6000_macro_to_expand): If IDENT is + function-like macro, peek following token(s) if it is followed + by CPP_OPEN_PAREN token with optional padding in between, and + if not, don't treat it like a macro. + 2016-03-21 Thomas Schwinge Alexander Monakov diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c index b6e42f6ecad..ceb80b216ba 100644 --- a/gcc/config/rs6000/rs6000-c.c +++ b/gcc/config/rs6000/rs6000-c.c @@ -216,7 +216,21 @@ rs6000_macro_to_expand (cpp_reader *pfile, const cpp_token *tok) else if (ident && (ident != C_CPP_HASHNODE (__vector_keyword))) { enum rid rid_code = (enum rid)(ident->rid_code); - if (ident->type == NT_MACRO) + enum node_type itype = ident->type; + /* If there is a function-like macro, check if it is going to be + invoked with or without arguments. Without following ( treat + it like non-macro, otherwise the following cpp_get_token eats + what should be preserved. */ + if (itype == NT_MACRO && cpp_fun_like_macro_p (ident)) + { + int idx2 = idx; + do + tok = cpp_peek_token (pfile, idx2++); + while (tok->type == CPP_PADDING); + if (tok->type != CPP_OPEN_PAREN) + itype = NT_VOID; + } + if (itype == NT_MACRO) { do (void) cpp_get_token (pfile); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 78802920f69..77fbafc0bcb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-03-21 Jakub Jelinek + + PR target/70296 + * gcc.target/powerpc/altivec-36.c: New test. + 2016-03-21 Richard Biener PR tree-optimization/70310 diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-36.c b/gcc/testsuite/gcc.target/powerpc/altivec-36.c new file mode 100644 index 00000000000..ce9e6a36b5d --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/altivec-36.c @@ -0,0 +1,46 @@ +/* PR target/70296 */ +/* { dg-do compile } */ +/* { dg-require-effective-target powerpc_altivec_ok } */ +/* { dg-options "-maltivec -std=gnu11" } */ + +#define c(x) x +#define f(x) +#define i int +#define k +typedef int vector; +typedef vector int V; +vector int a; +vector b; +vector c(int) d; +vector c(e); +vector c; +vector f(int) int g; +vector f(int) h; +vector i j; +vector k int l; +vector k m; +#define int(x) x +vector int n; +vector int(int) o; +vector int(r); +#undef int + +void +foo () +{ + V *p; + p = &a; + p = &d; + p = &g; + p = &j; + p = &l; + p = &n; + p = &o; + int *q; + q = &b; + q = &e; + q = &c; + q = &h; + q = &m; + q = &r; +} diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 89b582d7540..2352b7d640b 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2016-03-21 Jakub Jelinek + + PR target/70296 + * include/cpplib.h (cpp_fun_like_macro_p): New prototype. + * macro.c (cpp_fun_like_macro_p): New function. + 2016-03-15 Richard Henderson * line-map.c (new_linemap): Make alloc_size a size_t. diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 882f80cff46..35b0375c09c 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -813,6 +813,7 @@ extern int cpp_avoid_paste (cpp_reader *, const cpp_token *, extern const cpp_token *cpp_get_token (cpp_reader *); extern const cpp_token *cpp_get_token_with_location (cpp_reader *, source_location *); +extern bool cpp_fun_like_macro_p (cpp_hashnode *); extern const unsigned char *cpp_macro_definition (cpp_reader *, cpp_hashnode *); extern void _cpp_backup_tokens (cpp_reader *, unsigned int); diff --git a/libcpp/macro.c b/libcpp/macro.c index cfb09ceaddd..759fbe7f028 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -3301,6 +3301,15 @@ check_trad_stringification (cpp_reader *pfile, const cpp_macro *macro, } } +/* Returns true of NODE is a function-like macro. */ +bool +cpp_fun_like_macro_p (cpp_hashnode *node) +{ + return (node->type == NT_MACRO + && (node->flags & (NODE_BUILTIN | NODE_MACRO_ARG)) == 0 + && node->value.macro->fun_like); +} + /* Returns the name, arguments and expansion of a macro, in a format suitable to be read back in again, and therefore also for DWARF 2 debugging info. e.g. "PASTE(X, Y) X ## Y", or "MACNAME EXPANSION".