Hi!
On Tue, 28 Jun 2016 14:25:28 +0200, Jakub Jelinek <ja...@redhat.com> wrote:
> On Tue, Jun 28, 2016 at 02:19:13PM +0200, Thomas Schwinge wrote:
> > [...]
> >
> > OK for trunk?
>
> This LGTM if you tweak it to apply without the previous patch or with just
> a patch for PRAGMA_OMP_DECLARE.
>
> Thanks.
Committed in r237843:
commit 44e775d8fa59d9732f2a10106c3f37e9e3224daa
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed Jun 29 09:08:04 2016 +0000
Improve diagnostic messages of "#pragma omp cancel", "#pragma omp
cancellation point" parsing
gcc/c/
* c-parser.c (c_parser_pragma) <PRAGMA_OMP_CANCELLATION_POINT>:
Move pragma context checking into...
(c_parser_omp_cancellation_point): ... here, and improve
diagnostic messages.
* c-typeck.c (c_finish_omp_cancel)
(c_finish_omp_cancellation_point): Improve diagnostic messages.
gcc/cp/
* parser.c (cp_parser_pragma) <PRAGMA_OMP_CANCELLATION_POINT>:
Move pragma context checking into...
(cp_parser_omp_cancellation_point): ... here, and improve
diagnostic messages.
* semantics.c (finish_omp_cancel, finish_omp_cancellation_point):
Improve diagnostic messages.
gcc/testsuite/
* c-c++-common/gomp/cancel-1.c: Extend.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@237843
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/c/ChangeLog | 9 ++++++++
gcc/c/c-parser.c | 24 +++++++++++++---------
gcc/c/c-typeck.c | 4 ++--
gcc/cp/ChangeLog | 9 ++++++++
gcc/cp/parser.c | 33 +++++++++++++++---------------
gcc/cp/semantics.c | 4 ++--
gcc/testsuite/ChangeLog | 4 ++++
gcc/testsuite/c-c++-common/gomp/cancel-1.c | 15 ++++++++++++++
8 files changed, 72 insertions(+), 30 deletions(-)
diff --git gcc/c/ChangeLog gcc/c/ChangeLog
index df73934..7bd112b 100644
--- gcc/c/ChangeLog
+++ gcc/c/ChangeLog
@@ -1,3 +1,12 @@
+2016-06-29 Thomas Schwinge <tho...@codesourcery.com>
+
+ * c-parser.c (c_parser_pragma) <PRAGMA_OMP_CANCELLATION_POINT>:
+ Move pragma context checking into...
+ (c_parser_omp_cancellation_point): ... here, and improve
+ diagnostic messages.
+ * c-typeck.c (c_finish_omp_cancel)
+ (c_finish_omp_cancellation_point): Improve diagnostic messages.
+
2016-06-29 Jakub Jelinek <ja...@redhat.com>
PR c/71685
diff --git gcc/c/c-parser.c gcc/c/c-parser.c
index 1d2dac7..1a50dea 100644
--- gcc/c/c-parser.c
+++ gcc/c/c-parser.c
@@ -1358,11 +1358,11 @@ static tree c_parser_omp_for_loop (location_t, c_parser
*, enum tree_code,
static void c_parser_omp_taskwait (c_parser *);
static void c_parser_omp_taskyield (c_parser *);
static void c_parser_omp_cancel (c_parser *);
-static void c_parser_omp_cancellation_point (c_parser *);
enum pragma_context { pragma_external, pragma_struct, pragma_param,
pragma_stmt, pragma_compound };
static bool c_parser_pragma (c_parser *, enum pragma_context, bool *);
+static void c_parser_omp_cancellation_point (c_parser *, enum pragma_context);
static bool c_parser_omp_target (c_parser *, enum pragma_context, bool *);
static void c_parser_omp_end_declare_target (c_parser *);
static void c_parser_omp_declare (c_parser *, enum pragma_context);
@@ -10187,14 +10187,7 @@ c_parser_pragma (c_parser *parser, enum pragma_context
context, bool *if_p)
return false;
case PRAGMA_OMP_CANCELLATION_POINT:
- if (context != pragma_compound)
- {
- if (context == pragma_stmt)
- c_parser_error (parser, "%<#pragma omp cancellation point%> may "
- "only be used in compound statements");
- goto bad_stmt;
- }
- c_parser_omp_cancellation_point (parser);
+ c_parser_omp_cancellation_point (parser, context);
return false;
case PRAGMA_OMP_THREADPRIVATE:
@@ -15668,7 +15661,7 @@ c_parser_omp_cancel (c_parser *parser)
| (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_TASKGROUP))
static void
-c_parser_omp_cancellation_point (c_parser *parser)
+c_parser_omp_cancellation_point (c_parser *parser, enum pragma_context context)
{
location_t loc = c_parser_peek_token (parser)->location;
tree clauses;
@@ -15691,6 +15684,17 @@ c_parser_omp_cancellation_point (c_parser *parser)
return;
}
+ if (context != pragma_compound)
+ {
+ if (context == pragma_stmt)
+ error_at (loc, "%<#pragma omp cancellation point%> may only be used in"
+ " compound statements");
+ else
+ c_parser_error (parser, "expected declaration specifiers");
+ c_parser_skip_to_pragma_eol (parser, false);
+ return;
+ }
+
clauses
= c_parser_omp_all_clauses (parser, OMP_CANCELLATION_POINT_CLAUSE_MASK,
"#pragma omp cancellation point");
diff --git gcc/c/c-typeck.c gcc/c/c-typeck.c
index 56268fc..b2435de 100644
--- gcc/c/c-typeck.c
+++ gcc/c/c-typeck.c
@@ -11933,7 +11933,7 @@ c_finish_omp_cancel (location_t loc, tree clauses)
mask = 8;
else
{
- error_at (loc, "%<#pragma omp cancel must specify one of "
+ error_at (loc, "%<#pragma omp cancel%> must specify one of "
"%<parallel%>, %<for%>, %<sections%> or %<taskgroup%> "
"clauses");
return;
@@ -11972,7 +11972,7 @@ c_finish_omp_cancellation_point (location_t loc, tree
clauses)
mask = 8;
else
{
- error_at (loc, "%<#pragma omp cancellation point must specify one of "
+ error_at (loc, "%<#pragma omp cancellation point%> must specify one of "
"%<parallel%>, %<for%>, %<sections%> or %<taskgroup%> "
"clauses");
return;
diff --git gcc/cp/ChangeLog gcc/cp/ChangeLog
index 76b86a4..327391b 100644
--- gcc/cp/ChangeLog
+++ gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2016-06-29 Thomas Schwinge <tho...@codesourcery.com>
+
+ * parser.c (cp_parser_pragma) <PRAGMA_OMP_CANCELLATION_POINT>:
+ Move pragma context checking into...
+ (cp_parser_omp_cancellation_point): ... here, and improve
+ diagnostic messages.
+ * semantics.c (finish_omp_cancel, finish_omp_cancellation_point):
+ Improve diagnostic messages.
+
2016-06-28 Jakub Jelinek <ja...@redhat.com>
* Make-lang.in: Don't cat ../stage_current if it does not exist.
diff --git gcc/cp/parser.c gcc/cp/parser.c
index 739fca0..3e8270e 100644
--- gcc/cp/parser.c
+++ gcc/cp/parser.c
@@ -34395,7 +34395,8 @@ cp_parser_omp_cancel (cp_parser *parser, cp_token
*pragma_tok)
| (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_TASKGROUP))
static void
-cp_parser_omp_cancellation_point (cp_parser *parser, cp_token *pragma_tok)
+cp_parser_omp_cancellation_point (cp_parser *parser, cp_token *pragma_tok,
+ enum pragma_context context)
{
tree clauses;
bool point_seen = false;
@@ -34414,7 +34415,19 @@ cp_parser_omp_cancellation_point (cp_parser *parser,
cp_token *pragma_tok)
if (!point_seen)
{
cp_parser_error (parser, "expected %<point%>");
- cp_parser_require_pragma_eol (parser, pragma_tok);
+ cp_parser_skip_to_pragma_eol (parser, pragma_tok);
+ return;
+ }
+
+ if (context != pragma_compound)
+ {
+ if (context == pragma_stmt)
+ error_at (pragma_tok->location,
+ "%<#pragma omp cancellation point%> may only be used in"
+ " compound statements");
+ else
+ cp_parser_error (parser, "expected declaration specifiers");
+ cp_parser_skip_to_pragma_eol (parser, pragma_tok);
return;
}
@@ -37291,20 +37304,8 @@ cp_parser_pragma (cp_parser *parser, enum
pragma_context context, bool *if_p)
break;
case PRAGMA_OMP_CANCELLATION_POINT:
- switch (context)
- {
- case pragma_compound:
- cp_parser_omp_cancellation_point (parser, pragma_tok);
- return false;
- case pragma_stmt:
- error_at (pragma_tok->location,
- "%<#pragma omp cancellation point%> may only be "
- "used in compound statements");
- break;
- default:
- goto bad_stmt;
- }
- break;
+ cp_parser_omp_cancellation_point (parser, pragma_tok, context);
+ return false;
case PRAGMA_OMP_THREADPRIVATE:
cp_parser_omp_threadprivate (parser, pragma_tok);
diff --git gcc/cp/semantics.c gcc/cp/semantics.c
index fa4698e..d1fb119 100644
--- gcc/cp/semantics.c
+++ gcc/cp/semantics.c
@@ -8571,7 +8571,7 @@ finish_omp_cancel (tree clauses)
mask = 8;
else
{
- error ("%<#pragma omp cancel must specify one of "
+ error ("%<#pragma omp cancel%> must specify one of "
"%<parallel%>, %<for%>, %<sections%> or %<taskgroup%> clauses");
return;
}
@@ -8608,7 +8608,7 @@ finish_omp_cancellation_point (tree clauses)
mask = 8;
else
{
- error ("%<#pragma omp cancellation point must specify one of "
+ error ("%<#pragma omp cancellation point%> must specify one of "
"%<parallel%>, %<for%>, %<sections%> or %<taskgroup%> clauses");
return;
}
diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
index c1c9a31..bc85add 100644
--- gcc/testsuite/ChangeLog
+++ gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-29 Thomas Schwinge <tho...@codesourcery.com>
+
+ * c-c++-common/gomp/cancel-1.c: Extend.
+
2016-06-29 Jakub Jelinek <ja...@redhat.com>
PR tree-optimization/71625
diff --git gcc/testsuite/c-c++-common/gomp/cancel-1.c
gcc/testsuite/c-c++-common/gomp/cancel-1.c
index 896a768..d26fcf1 100644
--- gcc/testsuite/c-c++-common/gomp/cancel-1.c
+++ gcc/testsuite/c-c++-common/gomp/cancel-1.c
@@ -455,3 +455,18 @@ f3 (void)
}
}
}
+
+#pragma omp cancellation point /* { dg-error "expected declaration specifiers
before end of line" } */
+
+void
+f4 (void)
+{
+ if (0)
+#pragma omp cancellation EKAHI /* { dg-error "expected .point. before .EKAHI."
} */
+ ;
+#pragma omp cancellation HO OKAHI /* { dg-error "expected .point. before .HO."
} */
+ if (0)
+#pragma omp cancellation point /* { dg-error ".pragma omp cancellation point.
may only be used in compound statements" } */
+ ;
+#pragma omp cancellation point /* { dg-error ".pragma omp cancellation point.
must specify one of" } */
+}
Grüße
Thomas
