re PR fortran/47728 ([OOP] ICE on invalid CLASS declaration)

2011-02-14  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/47728
	* class.c (gfc_build_class_symbol): Give a fatal error on polymorphic
	arrays.
	* primary.c (gfc_match_varspec): Avoid ICE for invalid class
	declaration.

2011-02-14  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/47728
	* gfortran.dg/class_38.f03: New.

From-SVN: r170144

gcc/fortran/ChangeLog

 2011-02-14  Janus Weil  <janus@gcc.gnu.org>
 
+	PR fortran/47728
+	* class.c (gfc_build_class_symbol): Give a fatal error on polymorphic
+	arrays.
+	* primary.c (gfc_match_varspec): Avoid ICE for invalid class
+	declaration.
+
+2011-02-14  Janus Weil  <janus@gcc.gnu.org>
+
 	PR fortran/47349
 	* interface.c (get_expr_storage_size): Handle derived-type components.
 

gcc/fortran/class.c

@@ -186,7 +186,7 @@ gfc_build_class_symbol (gfc_typespec *ts, symbol_attribute *attr,
 
   if (*as)
     {
-      gfc_error ("Polymorphic array at %C not yet supported");
+      gfc_fatal_error ("Polymorphic array at %C not yet supported");
       return FAILURE;
     }
 

gcc/fortran/primary.c

@@ -1770,8 +1770,8 @@ gfc_match_varspec (gfc_expr *primary, int equiv_flag, bool sub_flag,
 
   if ((equiv_flag && gfc_peek_ascii_char () == '(')
       || gfc_peek_ascii_char () == '[' || sym->attr.codimension
-      || (sym->attr.dimension && !sym->attr.proc_pointer
-	  && !gfc_is_proc_ptr_comp (primary, NULL)
+      || (sym->attr.dimension && sym->ts.type != BT_CLASS
+	  && !sym->attr.proc_pointer && !gfc_is_proc_ptr_comp (primary, NULL)
 	  && !(gfc_matching_procptr_assignment
 	       && sym->attr.flavor == FL_PROCEDURE))
       || (sym->ts.type == BT_CLASS && sym->attr.class_ok

gcc/testsuite/ChangeLog

+2011-02-14  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/47728
+	* gfortran.dg/class_38.f03: New.
+
 2011-02-14  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc.dg/pr46494.c: New test.

gcc/testsuite/gfortran.dg/class_38.f03

+! { dg-do compile }
+!
+! PR 47728: [OOP] ICE on invalid CLASS declaration
+!
+! Contributed by Arjen Markus <arjen.markus@deltares.nl>
+
+program test_objects
+
+   implicit none
+
+   type, abstract :: shape
+   end type
+
+   type, extends(shape) :: rectangle
+       real :: width, height
+   end type
+
+   class(shape), dimension(2) :: object  ! { dg-error "must be dummy, allocatable or pointer" }
+
+   object(1) = rectangle( 1.0, 2.0 )  ! { dg-error "Unclassifiable statement" }
+
+end program test_objects