From 20e8b68f101fe3439f5af27a0ac9a7abb805f5c4 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 13 Nov 2015 13:47:50 +0000 Subject: [PATCH] gimplify.c (oacc_default_clause): Use inform for enclosing scope. gcc/ * gimplify.c (oacc_default_clause): Use inform for enclosing scope. gcc/testsuite/ * c-c++-common/goacc/data-default-1.c: Correct expected From-SVN: r230321 --- gcc/ChangeLog | 4 ++++ gcc/gimplify.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/goacc/data-default-1.c | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d616203793a..399eca9901d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-11-13 Nathan Sidwell + + * gimplify.c (oacc_default_clause): Use inform for enclosing scope. + 2015-11-13 Tom de Vries * gen-pass-instances.awk (handle_line): Rename prefix_len var to diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 3c8f8a202d1..a3ed3784f49 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -6007,7 +6007,7 @@ oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags) { error ("%qE not specified in enclosing OpenACC %qs construct", DECL_NAME (lang_hooks.decls.omp_report_decl (decl)), rkind); - error_at (ctx->location, "enclosing OpenACC %qs construct", rkind); + inform (ctx->location, "enclosing OpenACC %qs construct", rkind); } else gcc_checking_assert (ctx->default_kind == OMP_CLAUSE_DEFAULT_SHARED); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d0bce7f6335..539b58037dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-11-13 Nathan Sidwell + + * c-c++-common/goacc/data-default-1.c: Correct expected + diagnostic. + 2015-11-13 Richard Biener PR tree-optimization/68306 diff --git a/gcc/testsuite/c-c++-common/goacc/data-default-1.c b/gcc/testsuite/c-c++-common/goacc/data-default-1.c index 0741abca4ea..631032e6869 100644 --- a/gcc/testsuite/c-c++-common/goacc/data-default-1.c +++ b/gcc/testsuite/c-c++-common/goacc/data-default-1.c @@ -6,13 +6,13 @@ int main () int n = 2; int ary[2]; -#pragma acc parallel default (none) /* { dg-message "parallel construct" 2 } */ +#pragma acc parallel default (none) /* { dg-message "'parallel' construct" 2 } */ { ary[0] /* { dg-error "not specified in enclosing" } */ = n; /* { dg-error "not specified in enclosing" } */ } -#pragma acc kernels default (none) /* { dg-message "kernels construct" 2 } */ +#pragma acc kernels default (none) /* { dg-message "'kernels' construct" 2 } */ { ary[0] /* { dg-error "not specified in enclosing" } */ = n; /* { dg-error "not specified in enclosing" } */ -- 2.30.2