Revert "Fortran - ICE in gfc_check_do_variable, at fortran/parse.c:4446"

This reverts commit 72e3d92178b44a3722519ec68e72e307443bda70.

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 6e663b4..956003e 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1683,21 +1683,10 @@ find_array_section (gfc_expr *expr, gfc_ref *ref)
          return false;
        }
 
-#if 1
       cons = gfc_constructor_lookup (base, limit);
       gcc_assert (cons);
       gfc_constructor_append_expr (&expr->value.constructor,
                                   gfc_copy_expr (cons->expr), NULL);
-#else
-      cons = gfc_constructor_lookup (base, limit);
-      if (cons)
-       gfc_constructor_append_expr (&expr->value.constructor,
-                                    gfc_copy_expr (cons->expr), NULL);
-      else
-       {
-         t = false;
-       }
-#endif
     }
 
   mpz_clear (ptr);
@@ -3487,7 +3476,6 @@ gfc_specification_expr (gfc_expr *e)
     {
       gfc_error ("Expression at %L must be of INTEGER type, found %s",
                 &e->where, gfc_basic_typename (e->ts.type));
-      gfc_clear_ts (&e->ts);
       return false;
     }
 
@@ -3827,9 +3815,6 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue,
   int proc_pointer;
   bool same_rank;
 
-  if (!lvalue->symtree)
-    return false;
-
   lhs_attr = gfc_expr_attr (lvalue);
   if (lvalue->ts.type == BT_UNKNOWN && !lhs_attr.proc_pointer)
     {

diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index d148de3..2946201 100644 (file)
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -1409,7 +1409,7 @@ gfc_match_pointer_assignment (void)
   gfc_matching_procptr_assignment = 0;
 
   m = gfc_match (" %v =>", &lvalue);
-  if (m != MATCH_YES || !lvalue->symtree)
+  if (m != MATCH_YES)
     {
       m = MATCH_NO;
       goto cleanup;

diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 6d7845e..0522b39 100644 (file)
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -4588,9 +4588,6 @@ gfc_check_do_variable (gfc_symtree *st)
 {
   gfc_state_data *s;
 
-  if (!st)
-    return 0;
-
   for (s=gfc_state_stack; s; s = s->previous)
     if (s->do_variable == st)
       {

diff --git a/gcc/testsuite/gfortran.dg/pr95502.f90 b/gcc/testsuite/gfortran.dg/pr95502.f90
deleted file mode 100644 (file)
index d40fd9a..0000000
--- a/gcc/testsuite/gfortran.dg/pr95502.f90
+++ /dev/null
@@ -1,8 +0,0 @@
-! { dg-do compile }
-! PR fortran/95502 - ICE in gfc_check_do_variable, at fortran/parse.c:4446
-
-program p
-  integer, pointer :: z
-  nullify (z%kind)  ! { dg-error "in variable definition context" }
-  z%kind => NULL()  ! { dg-error "constant expression" }
-end