diff options
| author | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-10-22 04:40:57 +0000 |
|---|---|---|
| committer | pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-10-22 04:40:57 +0000 |
| commit | 08b7970877ad39a6d4193dd9419cca038401f29b (patch) | |
| tree | 389abe357363e85a6283e38c11d31b71d1521bdc /gcc/fortran | |
| parent | 61cf0455273741f22babe6fc00ea0b77d32c1784 (diff) | |
| download | gcc-08b7970877ad39a6d4193dd9419cca038401f29b.tar.gz | |
2013-10-22 Paul Thomas <pault@gcc.gnu.org>
PR fortran 57893
* class.c : Include target-memory.h.
(gfc_find_intrinsic_vtab) Build a minimal expression so that
gfc_element_size can be used to obtain the storage size, rather
that the kind value.
2013-10-22 Paul Thomas <pault@gcc.gnu.org>
PR fortran 57893
* gfortran.dg/unlimited_polymorphic_13.f90 : New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203915 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/class.c | 28 |
2 files changed, 25 insertions, 11 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5e51f2bbc27..3539d2cbebd 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2013-10-22 Paul Thomas <pault@gcc.gnu.org> + + PR fortran 57893 + * class.c : Include target-memory.h. + (gfc_find_intrinsic_vtab) Build a minimal expression so that + gfc_element_size can be used to obtain the storage size, rather + that the kind value. + 2013-10-21 Tobias Burnus <burnus@net-b.de> PR fortran/58803 diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index be4959a7dee..52b9760b271 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -53,6 +53,7 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "gfortran.h" #include "constructor.h" +#include "target-memory.h" /* Inserts a derived type component reference in a data reference chain. TS: base type of the ref chain so far, in which we will pick the component @@ -618,7 +619,7 @@ gfc_build_class_symbol (gfc_typespec *ts, symbol_attribute *attr, if (!ts->u.derived->attr.unlimited_polymorphic) fclass->attr.abstract = ts->u.derived->attr.abstract; fclass->f2k_derived = gfc_get_namespace (NULL, 0); - if (!gfc_add_flavor (&fclass->attr, FL_DERIVED, NULL, + if (!gfc_add_flavor (&fclass->attr, FL_DERIVED, NULL, &gfc_current_locus)) return false; @@ -2135,7 +2136,7 @@ gfc_find_derived_vtab (gfc_symbol *derived) { gfc_get_symbol (name, ns, &vtab); vtab->ts.type = BT_DERIVED; - if (!gfc_add_flavor (&vtab->attr, FL_VARIABLE, NULL, + if (!gfc_add_flavor (&vtab->attr, FL_VARIABLE, NULL, &gfc_current_locus)) goto cleanup; vtab->attr.target = 1; @@ -2152,7 +2153,7 @@ gfc_find_derived_vtab (gfc_symbol *derived) gfc_symbol *parent = NULL, *parent_vtab = NULL; gfc_get_symbol (name, ns, &vtype); - if (!gfc_add_flavor (&vtype->attr, FL_DERIVED, NULL, + if (!gfc_add_flavor (&vtype->attr, FL_DERIVED, NULL, &gfc_current_locus)) goto cleanup; vtype->attr.access = ACCESS_PUBLIC; @@ -2456,7 +2457,7 @@ gfc_find_intrinsic_vtab (gfc_typespec *ts) { gfc_get_symbol (name, ns, &vtab); vtab->ts.type = BT_DERIVED; - if (!gfc_add_flavor (&vtab->attr, FL_VARIABLE, NULL, + if (!gfc_add_flavor (&vtab->attr, FL_VARIABLE, NULL, &gfc_current_locus)) goto cleanup; vtab->attr.target = 1; @@ -2473,9 +2474,10 @@ gfc_find_intrinsic_vtab (gfc_typespec *ts) int hash; gfc_namespace *sub_ns; gfc_namespace *contained; + gfc_expr *e; gfc_get_symbol (name, ns, &vtype); - if (!gfc_add_flavor (&vtype->attr, FL_DERIVED, NULL, + if (!gfc_add_flavor (&vtype->attr, FL_DERIVED, NULL, &gfc_current_locus)) goto cleanup; vtype->attr.access = ACCESS_PUBLIC; @@ -2498,12 +2500,16 @@ gfc_find_intrinsic_vtab (gfc_typespec *ts) c->ts.type = BT_INTEGER; c->ts.kind = 4; c->attr.access = ACCESS_PRIVATE; - if (ts->type == BT_CHARACTER) - c->initializer = gfc_get_int_expr (gfc_default_integer_kind, - NULL, charlen*ts->kind); - else - c->initializer = gfc_get_int_expr (gfc_default_integer_kind, - NULL, ts->kind); + + /* Build a minimal expression to make use of + target-memory.c/gfc_element_size for 'size'. */ + e = gfc_get_expr (); + e->ts = *ts; + e->expr_type = EXPR_VARIABLE; + c->initializer = gfc_get_int_expr (gfc_default_integer_kind, + NULL, + (int)gfc_element_size (e)); + gfc_free_expr (e); /* Add component _extends. */ if (!gfc_add_component (vtype, "_extends", &c)) |