re PR fortran/79841 (Inconsistent diagnostics in fortran/openmp.c, function check_sym...

2017-03-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/79841
	* openmp.c (check_symbol_not_pointer): Adjust diagnostics.

From-SVN: r246241

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ffad6187e5efd5046de84753c70d3b3c3fcbb9f9..55dc64981e4b6aed7cb42b5092332acf47fff4f1 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR fortran/79841
+       * openmp.c (check_symbol_not_pointer): Adjust diagnostics.
+
 2017-03-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/80010

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 46f8952a1794639358eb27e7c98c4460a2c44ea1..11f4efb67a113c3b1ce6fcc87ef61a3a11ad095e 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -3735,7 +3735,7 @@ check_symbol_not_pointer (gfc_symbol *sym, locus loc, const char *name)
     gfc_error ("Cray pointer object %qs of derived type in %s clause at %L",
               sym->name, name, &loc);
   if (sym->ts.type == BT_DERIVED && sym->attr.cray_pointee)
-    gfc_error ("Cray pointee object of derived type %qs in %s clause at %L",
+    gfc_error ("Cray pointee object %qs of derived type in %s clause at %L",
               sym->name, name, &loc);
 
   if ((sym->ts.type == BT_ASSUMED && sym->attr.pointer)
@@ -3746,12 +3746,12 @@ check_symbol_not_pointer (gfc_symbol *sym, locus loc, const char *name)
   if ((sym->ts.type == BT_ASSUMED && sym->attr.cray_pointer)
       || (sym->ts.type == BT_CLASS && CLASS_DATA (sym)
          && CLASS_DATA (sym)->attr.cray_pointer))
-    gfc_error ("Cray pointer object of polymorphic type %qs in %s clause at %L",
+    gfc_error ("Cray pointer object %qs of polymorphic type in %s clause at %L",
               sym->name, name, &loc);
   if ((sym->ts.type == BT_ASSUMED && sym->attr.cray_pointee)
       || (sym->ts.type == BT_CLASS && CLASS_DATA (sym)
          && CLASS_DATA (sym)->attr.cray_pointee))
-    gfc_error ("Cray pointee object of polymorphic type %qs in %s clause at %L",
+    gfc_error ("Cray pointee object %qs of polymorphic type in %s clause at %L",
               sym->name, name, &loc);
 }