aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2011-02-14 19:12:55 +0100
committerJanus Weil <janus@gcc.gnu.org>2011-02-14 19:12:55 +0100
commitce2ab24c22e3bc5a8a2993ef7de3fea3db7d4309 (patch)
treeb51794372ca1494e209f190ba27e6bfe9fb0a5f2 /gcc/fortran
parentc7dd803e61952604df6992be3c5b68cb1abfd983 (diff)
downloadgcc-ce2ab24c22e3bc5a8a2993ef7de3fea3db7d4309.zip
gcc-ce2ab24c22e3bc5a8a2993ef7de3fea3db7d4309.tar.gz
gcc-ce2ab24c22e3bc5a8a2993ef7de3fea3db7d4309.tar.bz2
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
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/class.c2
-rw-r--r--gcc/fortran/primary.c4
3 files changed, 11 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9bf2eb0..db0069e 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,13 @@
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.
diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c
index 7c8babe..67f19f7 100644
--- a/gcc/fortran/class.c
+++ b/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;
}
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 360176e..b673e0b 100644
--- a/gcc/fortran/primary.c
+++ b/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