re PR fortran/85895 (ICE in gfc_conv_array_ref, at fortran/trans-array.c:3518)

2018-05-25  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/85895
	Backport from trunk
	* resolve.c (resolve_sync): Resolve expression before checking for
	an error.

2018-05-25  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/85895
	Backport from trunk
	* gfortran.dg/coarray_3.f90: Fix invalid testcase.
	* gfortran.dg/pr85895.f90: New test.

From-SVN: r260770

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ff480f2824c90e2f36a40541454c2c85914ffe5b..681f61823b5648411a64ceb1762f0f947337a958 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-05-25  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/85895
+       Backport from trunk
+       * resolve.c (resolve_sync): Resolve expression before checking for
+       an error.
+
 2018-05-20  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/80657

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index ed9b3f1d56546bc9c5d24d544fbe9d57aca65c19..4f1b5ce9b9dc4756026d9649b5de7e66927dd9ee 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9299,6 +9299,7 @@ resolve_sync (gfc_code *code)
     }
 
   /* Check STAT.  */
+  gfc_resolve_expr (code->expr2);
   if (code->expr2
       && (code->expr2->ts.type != BT_INTEGER || code->expr2->rank != 0
          || code->expr2->expr_type != EXPR_VARIABLE))
@@ -9306,6 +9307,7 @@ resolve_sync (gfc_code *code)
               &code->expr2->where);
 
   /* Check ERRMSG.  */
+  gfc_resolve_expr (code->expr3);
   if (code->expr3
       && (code->expr3->ts.type != BT_CHARACTER || code->expr3->rank != 0
          || code->expr3->expr_type != EXPR_VARIABLE))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7652fe8e14aee27e8eb9c5fa24602b07ad795040..6622385a3b469aadb2fe3cecaff02906426dc3bd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-05-25  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/85895
+       Backport from trunk
+       * gfortran.dg/coarray_3.f90: Fix invalid testcase.
+       * gfortran.dg/pr85895.f90: New test.
+
 2018-05-24  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.target/i386/avx512f-vcvtusi2sd64-1.c: Update scan string.

diff --git a/gcc/testsuite/gfortran.dg/coarray_3.f90 b/gcc/testsuite/gfortran.dg/coarray_3.f90
index aba4eb1bc847b04c07f644bc43247712a500ce74..d152ce1b2bdcb023aa28e8b94eb78e831fc0f402 100644 (file)
--- a/gcc/testsuite/gfortran.dg/coarray_3.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_3.f90
@@ -13,7 +13,7 @@ end critical fkl ! { dg-error "Expecting END PROGRAM" }
 
 sync all (stat=1) ! { dg-error "Syntax error in SYNC ALL" }
 sync all ( stat = n,stat=k) ! { dg-error "Redundant STAT" }
-sync memory (errmsg=str)
+sync memory (errmsg=str) ! { dg-error "must be a scalar CHARACTER variable" }
 sync memory (errmsg=n) ! { dg-error "must be a scalar CHARACTER variable" }
 sync images (*, stat=1.0) ! { dg-error "Syntax error in SYNC IMAGES" }
 sync images (-1) ! { dg-error "must between 1 and num_images" }

diff --git a/gcc/testsuite/gfortran.dg/pr85895.f90 b/gcc/testsuite/gfortran.dg/pr85895.f90
new file mode 100644 (file)
index 0000000..184266e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr85895.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! { dg-options "-fcoarray=lib" }
+! PR fortran/85895
+subroutine p
+   character(80) :: c(2)
+   sync memory (errmsg=c)        ! { dg-error "scalar CHARACTER variable" }
+end subroutine p
+
+subroutine q
+   character(80) :: c(2)
+   sync memory (errmsg=c(1:2))   ! { dg-error "scalar CHARACTER variable" }
+end subroutine q
+
+subroutine r
+   character(80) :: c(2)
+   sync memory (errmsg=c(1))
+end subroutine r