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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d616203793a7d6ceab5c024ed8104bd51549b4d7..399eca9901d384029f9517b8b2cfbfef89419091 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * gimplify.c (oacc_default_clause): Use inform for enclosing scope.
+
 2015-11-13  Tom de Vries  <tom@codesourcery.com>
 
        * gen-pass-instances.awk (handle_line): Rename prefix_len var to

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 3c8f8a202d1c66cc95a14ab87817c2fb0993908e..a3ed3784f49484df8a8a6d989ee11cc1f6e250cd 100644 (file)
--- 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 d0bce7f63357243a7d2bdf9863789d4cef07af26..539b58037dc0845a096590b76a2890c50e0d31ff 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * c-c++-common/goacc/data-default-1.c: Correct expected
+       diagnostic.
+
 2015-11-13  Richard Biener  <rguenther@suse.de>
 
        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 0741abca4eac4885ab48c7df4b523f11174354ab..631032e68697b291f79b4900f0b0def5c142d084 100644 (file)
--- 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" } */