re PR fortran/77429 (ICE in gfc_check_dependency, at fortran/dependency.c:1261)

2016-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/77429
	* dependency.c (gfc_check_dependency):  Convert gcc_assert() to
	a conditional and possible call to  gfc_internal_error().

2016-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/77429
	* gfortran.dg/pr77429.f90: New test.

From-SVN: r240477

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 96867e386d68ecb09750f1edc5fb9367873edd5e..5675e03039e351df805b002e2566b06941c69076 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/77429 
+       * dependency.c (gfc_check_dependency):  Convert gcc_assert() to
+       a conditional and possible call to  gfc_internal_error().
+
 2016-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/77694

diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index 58a443be09a82834545cf0d67e05ddc26dbf5b9e..12e5d13315173f247cf7d952450df1d833395da1 100644 (file)
--- a/gcc/fortran/dependency.c
+++ b/gcc/fortran/dependency.c
@@ -1258,7 +1258,8 @@ gfc_check_dependency (gfc_expr *expr1, gfc_expr *expr2, bool identical)
       && strcmp (expr1->value.function.name, "_F.caf_get") == 0)
     return 0;
 
-  gcc_assert (expr1->expr_type == EXPR_VARIABLE);
+  if (expr1->expr_type != EXPR_VARIABLE)
+    gfc_internal_error ("gfc_check_dependency: expecting an EXPR_VARIABLE");
 
   switch (expr2->expr_type)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5f7435ee8977e9b0b5cb944babd08cd7c23ce783..45e5307f679f15947be343bb66037d669085c540 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/77429 
+       * gfortran.dg/pr77429.f90: New test.
+
 2016-09-25  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/77694

diff --git a/gcc/testsuite/gfortran.dg/pr77429.f90 b/gcc/testsuite/gfortran.dg/pr77429.f90
new file mode 100644 (file)
index 0000000..0f90237
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr77429.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+program p
+   shape(1) = 0      ! { dg-error "expression in variable definition context" }
+   shape(1,2) = 0    ! { dg-error "expression in variable definition context" }
+   shape(1,2,3) = 0  ! { dg-error "Too many arguments in call" }
+   lbound([1]) = 0   ! { dg-error "expression in variable definition context" }
+end