re PR fortran/91496 (!GCC$ directives error if mistyped or unknown)

2019-09-05  Harald Anlauf  <anlauf@gmx.de>

	PR fortran/91496
	* parse.c (parse_executable): Improve error messages for
	improperly placed pragmas not preceeding a loop.

	PR fortran/91496
	* gfortran.dg/directive_unroll_5.f90: Adjust error message.

From-SVN: r275442

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 129bfdd9ae741f02f6e7f9bb47a3c539c0187931..9c787f73bfd0df7dfbe563fab4517171709457a5 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-05  Harald Anlauf  <anlauf@gmx.de>
+
+       PR fortran/91496
+       * parse.c (parse_executable): Improve error messages for
+       improperly placed pragmas not preceeding a loop.
+
 2019-09-05  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/91660

diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index caea16b9f5fc686362c03eefd07e368fb89cefb2..5bd04b839ce78b05215c8c93eba185603ae901b9 100644 (file)
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -5541,16 +5541,17 @@ parse_executable (gfc_statement st)
        }
 
       if (directive_unroll != -1)
-       gfc_error ("%<GCC unroll%> directive does not commence a loop at %C");
+       gfc_error ("%<GCC unroll%> directive not at the start of a loop at %C");
 
       if (directive_ivdep)
-       gfc_error ("%<GCC ivdep%> directive does not commence a loop at %C");
+       gfc_error ("%<GCC ivdep%> directive not at the start of a loop at %C");
 
       if (directive_vector)
-       gfc_error ("%<GCC vector%> directive does not commence a loop at %C");
+       gfc_error ("%<GCC vector%> directive not at the start of a loop at %C");
 
       if (directive_novector)
-       gfc_error ("%<GCC novector%> directive does not commence a loop at %C");
+       gfc_error ("%<GCC novector%> "
+                  "directive not at the start of a loop at %C");
 
       st = next_statement ();
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a43cec3e282b969c059ae3b1878d25efb940cd36..faf5f15a60e2d972aeae97f58d57849d9704211c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-05  Harald Anlauf  <anlauf@gmx.de>
+
+       PR fortran/91496
+       * gfortran.dg/directive_unroll_5.f90: Adjust error message.
+
 2019-09-05  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/91660

diff --git a/gcc/testsuite/gfortran.dg/directive_unroll_5.f90 b/gcc/testsuite/gfortran.dg/directive_unroll_5.f90
index b88b4b2c380c9d7dc755e054b0a6e71050cef197..33f2fda537fce85cfb70c6a4fad6f66c541d8d57 100644 (file)
--- a/gcc/testsuite/gfortran.dg/directive_unroll_5.f90
+++ b/gcc/testsuite/gfortran.dg/directive_unroll_5.f90
@@ -31,7 +31,7 @@ subroutine wrong3(a, b, n)
   integer :: a(n), b(n)
   integer (kind=4) :: i
 !GCC$ unroll 8
-  write (*,*) "wrong"! { dg-error "directive does not commence a loop" }
+  write (*,*) "wrong"! { dg-error "directive not at the start of a loop" }
   DO i=n, 1, -1
     call dummy2(a(i), b(i), i)
   ENDDO