From 528622fd85a8e2f7c8f70c4e8a9486c4c426c4a5 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Wed, 16 Feb 2011 21:51:56 +0100 Subject: [PATCH] re PR fortran/47745 ([OOP] Segfault with CLASS(*) and derived type dummy arguments) 2011-02-16 Janus Weil PR fortran/47745 * class.c (gfc_build_class_symbol): Set 'class_ok' attribute. * decl.c (build_sym,attr_decl1): Move setting of 'class_ok' into 'gfc_build_class_symbol'. (gfc_match_decl_type_spec): Reject unlimited polymorphism. * interface.c (matching_typebound_op): Check for 'class_ok' attribute. * match.c (select_type_set_tmp): Move setting of 'class_ok' into 'gfc_build_class_symbol'. * primary.c (gfc_variable_attr): Check for 'class_ok' attribute. 2011-02-16 Janus Weil PR fortran/47745 * gfortran.dg/class_39.f03: New. From-SVN: r170223 --- gcc/fortran/ChangeLog | 12 ++++++++++++ gcc/fortran/class.c | 10 ++++++++++ gcc/fortran/decl.c | 18 ++++++++++++------ gcc/fortran/interface.c | 6 +++++- gcc/fortran/match.c | 7 ++----- gcc/fortran/primary.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/class_39.f03 | 13 +++++++++++++ 8 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/class_39.f03 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 346bb9eda92..340df016154 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,15 @@ +2011-02-16 Janus Weil + + PR fortran/47745 + * class.c (gfc_build_class_symbol): Set 'class_ok' attribute. + * decl.c (build_sym,attr_decl1): Move setting of 'class_ok' into + 'gfc_build_class_symbol'. + (gfc_match_decl_type_spec): Reject unlimited polymorphism. + * interface.c (matching_typebound_op): Check for 'class_ok' attribute. + * match.c (select_type_set_tmp): Move setting of 'class_ok' into + 'gfc_build_class_symbol'. + * primary.c (gfc_variable_attr): Check for 'class_ok' attribute. + 2011-02-15 Steven G. Kargl PR fortran/47633 diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index 67f19f7f694..85da3cb2b45 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -183,6 +183,16 @@ gfc_build_class_symbol (gfc_typespec *ts, symbol_attribute *attr, gfc_symbol *fclass; gfc_symbol *vtab; gfc_component *c; + + if (attr->class_ok) + /* Class container has already been built. */ + return SUCCESS; + + attr->class_ok = attr->dummy || attr->pointer || attr->allocatable; + + if (!attr->class_ok) + /* We can not build the class container yet. */ + return SUCCESS; if (*as) { diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 9712ea2aa09..8b5f92b4f8c 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1177,9 +1177,7 @@ build_sym (const char *name, gfc_charlen *cl, bool cl_deferred, sym->attr.implied_index = 0; - if (sym->ts.type == BT_CLASS - && (sym->attr.class_ok = sym->attr.dummy || sym->attr.pointer - || sym->attr.allocatable)) + if (sym->ts.type == BT_CLASS) return gfc_build_class_symbol (&sym->ts, &sym->attr, &sym->as, false); return SUCCESS; @@ -2613,6 +2611,16 @@ gfc_match_decl_type_spec (gfc_typespec *ts, int implicit_flag) ts->type = BT_DERIVED; else { + /* Match CLASS declarations. */ + m = gfc_match (" class ( * )"); + if (m == MATCH_ERROR) + return MATCH_ERROR; + else if (m == MATCH_YES) + { + gfc_fatal_error ("Unlimited polymorphism at %C not yet supported"); + return MATCH_ERROR; + } + m = gfc_match (" class ( %n )", name); if (m != MATCH_YES) return m; @@ -6045,9 +6053,7 @@ attr_decl1 (void) } } - if (sym->ts.type == BT_CLASS && !sym->attr.class_ok - && (sym->attr.class_ok = sym->attr.class_ok || current_attr.allocatable - || current_attr.pointer) + if (sym->ts.type == BT_CLASS && gfc_build_class_symbol (&sym->ts, &sym->attr, &sym->as, false) == FAILURE) { m = MATCH_ERROR; diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 071eed951ed..b0b74c14b9f 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -2924,7 +2924,11 @@ matching_typebound_op (gfc_expr** tb_base, gfc_try result; if (base->expr->ts.type == BT_CLASS) - derived = CLASS_DATA (base->expr)->ts.u.derived; + { + if (!gfc_expr_attr (base->expr).class_ok) + continue; + derived = CLASS_DATA (base->expr)->ts.u.derived; + } else derived = base->expr->ts.u.derived; diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 01b88ffd46e..d2d9f5f934b 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -4536,11 +4536,8 @@ select_type_set_tmp (gfc_typespec *ts) gfc_add_pointer (&tmp->n.sym->attr, NULL); gfc_add_flavor (&tmp->n.sym->attr, FL_VARIABLE, name, NULL); if (ts->type == BT_CLASS) - { - gfc_build_class_symbol (&tmp->n.sym->ts, &tmp->n.sym->attr, - &tmp->n.sym->as, false); - tmp->n.sym->attr.class_ok = 1; - } + gfc_build_class_symbol (&tmp->n.sym->ts, &tmp->n.sym->attr, + &tmp->n.sym->as, false); tmp->n.sym->attr.select_type_temporary = 1; /* Add an association for it, so the rest of the parser knows it is diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index b673e0b4927..c8e2bb6b034 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -2033,7 +2033,7 @@ gfc_variable_attr (gfc_expr *expr, gfc_typespec *ts) sym = expr->symtree->n.sym; attr = sym->attr; - if (sym->ts.type == BT_CLASS) + if (sym->ts.type == BT_CLASS && sym->attr.class_ok) { dimension = CLASS_DATA (sym)->attr.dimension; pointer = CLASS_DATA (sym)->attr.class_pointer; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e11bdf3cee8..19488e8d73b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-02-16 Janus Weil + + PR fortran/47745 + * gfortran.dg/class_39.f03: New. + 2011-02-16 Dodji Seketeli PR c++/47326 diff --git a/gcc/testsuite/gfortran.dg/class_39.f03 b/gcc/testsuite/gfortran.dg/class_39.f03 new file mode 100644 index 00000000000..bc8039fc0c5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_39.f03 @@ -0,0 +1,13 @@ +! { dg-do compile } +! +! PR 47745: [OOP] Segfault with CLASS(*) and derived type dummy arguments +! +! Contributed by Rodney Polkinghorne + + type, abstract :: T + end type T +contains + class(T) function add() ! { dg-error "must be dummy, allocatable or pointer" } + add = 1 ! { dg-error "Variable must not be polymorphic in assignment" } + end function +end