From 9c378aa9f4c34dcf06f58b8446858bf0aee7880e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 23 Nov 2017 21:18:10 +0100 Subject: [PATCH] parser.c (cp_parser_omp_declare): Change return type to bool from void, return true for declare simd. * 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. From-SVN: r255117 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/parser.c | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ac623f08f40..e93964178eb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2017-11-23 Jakub Jelinek + + * 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. + 2017-11-23 Mike Stump Eric Botcazou diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 1ad351cdbd7..847ad1464e1 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -37903,7 +37903,7 @@ cp_parser_omp_declare_reduction (cp_parser *parser, cp_token *pragma_tok, 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) { @@ -37917,7 +37917,7 @@ cp_parser_omp_declare (cp_parser *parser, cp_token *pragma_tok, 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) @@ -37925,23 +37925,24 @@ cp_parser_omp_declare (cp_parser *parser, cp_token *pragma_tok, 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 % or % " "or %"); cp_parser_require_pragma_eol (parser, pragma_tok); + return false; } /* OpenMP 4.5: @@ -38860,8 +38861,7 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context, bool *if_p) 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); -- 2.30.2