* [committed] Fix declare-simd-1.C testcase failure
@ 2017-11-23 20:36 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2017-11-23 20:36 UTC (permalink / raw)
To: gcc-patches
Hi!
The -Wreturn-type warning on declare-simd-1.C shows we were actually
misparsing it with -fopenmp, e.g.
if (1)
#pragma omp declare simd
extern float foo (float);
n++;
was actually parsed as
if (1)
{
#pragma omp declare simd
extern float foo (float);
n++;
}
Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux,
committed to trunk.
2017-11-23 Jakub Jelinek <jakub@redhat.com>
* parser.c (cp_parser_omp_declare): Change return type to bool from
void, return true for declare simd.
(cp_parser_pragma): Return cp_parser_omp_declare returned value
rather than always false.
--- gcc/cp/parser.c.jj 2017-11-23 15:31:44.000000000 +0100
+++ gcc/cp/parser.c 2017-11-23 17:29:54.925145608 +0100
@@ -37904,7 +37904,7 @@ cp_parser_omp_declare_reduction (cp_pars
initializer-clause[opt] new-line
#pragma omp declare target new-line */
-static void
+static bool
cp_parser_omp_declare (cp_parser *parser, cp_token *pragma_tok,
enum pragma_context context)
{
@@ -37918,7 +37918,7 @@ cp_parser_omp_declare (cp_parser *parser
cp_lexer_consume_token (parser->lexer);
cp_parser_omp_declare_simd (parser, pragma_tok,
context);
- return;
+ return true;
}
cp_ensure_no_omp_declare_simd (parser);
if (strcmp (p, "reduction") == 0)
@@ -37926,23 +37926,24 @@ cp_parser_omp_declare (cp_parser *parser
cp_lexer_consume_token (parser->lexer);
cp_parser_omp_declare_reduction (parser, pragma_tok,
context);
- return;
+ return false;
}
if (!flag_openmp) /* flag_openmp_simd */
{
cp_parser_skip_to_pragma_eol (parser, pragma_tok);
- return;
+ return false;
}
if (strcmp (p, "target") == 0)
{
cp_lexer_consume_token (parser->lexer);
cp_parser_omp_declare_target (parser, pragma_tok);
- return;
+ return false;
}
}
cp_parser_error (parser, "expected %<simd%> or %<reduction%> "
"or %<target%>");
cp_parser_require_pragma_eol (parser, pragma_tok);
+ return false;
}
/* OpenMP 4.5:
@@ -38861,8 +38862,7 @@ cp_parser_pragma (cp_parser *parser, enu
return false;
case PRAGMA_OMP_DECLARE:
- cp_parser_omp_declare (parser, pragma_tok, context);
- return false;
+ return cp_parser_omp_declare (parser, pragma_tok, context);
case PRAGMA_OACC_DECLARE:
cp_parser_oacc_declare (parser, pragma_tok);
Jakub
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-11-23 20:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-23 20:36 [committed] Fix declare-simd-1.C testcase failure Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).