From 2da189b6ead100a2741fbc27abdad5bc479ac828 Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Fri, 17 Mar 2017 18:21:08 +0000 Subject: [PATCH] re PR fortran/79841 (Inconsistent diagnostics in fortran/openmp.c, function check_symbol_not_pointer) 2017-03-17 Jerry DeLisle PR fortran/79841 * openmp.c (check_symbol_not_pointer): Adjust diagnostics. From-SVN: r246241 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/openmp.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ffad6187e5e..55dc64981e4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2017-03-17 Jerry DeLisle + + PR fortran/79841 + * openmp.c (check_symbol_not_pointer): Adjust diagnostics. + 2017-03-16 Jakub Jelinek PR fortran/80010 diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 46f8952a179..11f4efb67a1 100644 --- 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); } -- 2.30.2