Hello world,
the attached, rather straightforward patch fixes a rejects-valid error
by fixing up the contiguous attribute for a class, and by using the
correct attributes.
Regression-tested. OK for trunk?
Regards
Thomas
2019-01-27 Thomas Koenig <tkoe...@gcc.gnu.org>
PR fortran/88669
* resolve.c (resolve_component): If the reference is a BT_CLASS,
copy the contiguous attribute from the reference and use the
correct attributes.
2019-01-27 Thomas Koenig <tkoe...@gcc.gnu.org>
PR fortran/88669
* gfortran.dg/contiguous_9.f90: New test.
Index: resolve.c
===================================================================
--- resolve.c (Revision 268104)
+++ resolve.c (Arbeitskopie)
@@ -13761,6 +13761,7 @@ static bool
resolve_component (gfc_component *c, gfc_symbol *sym)
{
gfc_symbol *super_type;
+ symbol_attribute *attr;
if (c->attr.artificial)
return true;
@@ -13803,8 +13804,24 @@ resolve_component (gfc_component *c, gfc_symbol *s
}
/* F2008, C448. */
- if (c->attr.contiguous && (!c->attr.dimension || !c->attr.pointer))
+ if (c->ts.type == BT_CLASS)
{
+ if (CLASS_DATA (c))
+ {
+ attr = &(CLASS_DATA (c)->attr);
+
+ /* Fix up contiguous attribute. */
+ if (c->attr.contiguous)
+ attr->contiguous = 1;
+ }
+ else
+ attr = NULL;
+ }
+ else
+ attr = &c->attr;
+
+ if (attr && attr->contiguous && (!attr->dimension || !attr->pointer))
+ {
gfc_error ("Component %qs at %L has the CONTIGUOUS attribute but "
"is not an array pointer", c->name, &c->loc);
return false;
program contiguous_pointer
type t
end type t
type s
class(t), dimension(:), contiguous, pointer :: x ! OK
class(t), contiguous, allocatable :: y ! { dg-error "has the CONTIGUOUS attribute but is not an array pointer" }
class(t), contiguous, pointer :: z ! { dg-error "has the CONTIGUOUS attribute but is not an array pointer" }
end type s
end program contiguous_pointer
