diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-05-30 23:56:11 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-05-30 23:56:11 +0200 |
| commit | 7a08eda1619ac02b31ff4bcf8582a94237424132 (patch) | |
| tree | bd664a3b4e0b3ba3499bd2892841cf41c6b4a076 /gcc/fortran/trans-array.c | |
| parent | 66a3e33967b012b5ec524c0c57618fe7408ce440 (diff) | |
| download | gcc-7a08eda1619ac02b31ff4bcf8582a94237424132.zip gcc-7a08eda1619ac02b31ff4bcf8582a94237424132.tar.gz gcc-7a08eda1619ac02b31ff4bcf8582a94237424132.tar.bz2 | |
gfortran.h (CLASS_DATA): New macro for accessing the $data component of a class container.
2010-05-30 Janus Weil <janus@gcc.gnu.org>
* gcc/fortran/gfortran.h (CLASS_DATA): New macro for accessing the
$data component of a class container.
* gcc/fortran/decl.c (attr_decl1): Use macro CLASS_DATA.
* gcc/fortran/expr.c (gfc_check_pointer_assign,gfc_check_assign_symbol,
gfc_has_ultimate_allocatable,gfc_has_ultimate_pointer): Ditto.
* gcc/fortran/interface.c (matching_typebound_op): Ditto.
* gcc/fortran/match.c (gfc_match_allocate, gfc_match_deallocate): Ditto.
* gcc/fortran/parse.c (parse_derived): Ditto.
* gcc/fortran/primary.c (gfc_match_varspec, gfc_variable_attr,
gfc_expr_attr): Ditto.
* gcc/fortran/resolve.c (resolve_structure_cons, find_array_spec,
resolve_deallocate_expr, resolve_allocate_expr, resolve_select_type,
resolve_fl_var_and_proc, resolve_typebound_procedure,
resolve_fl_derived): Ditto.
* gcc/fortran/symbol.c (gfc_type_compatible): Restructured.
* gcc/fortran/trans-array.c (structure_alloc_comps): Use macro
CLASS_DATA.
* gcc/fortran/trans-decl.c (gfc_get_symbol_decl,
gfc_trans_deferred_vars): Ditto.
* gcc/fortran/trans-stmt.c (gfc_trans_allocate): Ditto.
From-SVN: r160060
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index ddfe40f..7d7b3a3 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6079,14 +6079,13 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl, build_int_cst (TREE_TYPE (comp), 0)); gfc_add_expr_to_block (&fnblock, tmp); } - else if (c->ts.type == BT_CLASS - && c->ts.u.derived->components->attr.allocatable) + else if (c->ts.type == BT_CLASS && CLASS_DATA (c)->attr.allocatable) { /* Allocatable scalar CLASS components. */ comp = fold_build3 (COMPONENT_REF, ctype, decl, cdecl, NULL_TREE); /* Add reference to '$data' component. */ - tmp = c->ts.u.derived->components->backend_decl; + tmp = CLASS_DATA (c)->backend_decl; comp = fold_build3 (COMPONENT_REF, TREE_TYPE (tmp), comp, tmp, NULL_TREE); @@ -6116,13 +6115,12 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl, build_int_cst (TREE_TYPE (comp), 0)); gfc_add_expr_to_block (&fnblock, tmp); } - else if (c->ts.type == BT_CLASS - && c->ts.u.derived->components->attr.allocatable) + else if (c->ts.type == BT_CLASS && CLASS_DATA (c)->attr.allocatable) { /* Allocatable scalar CLASS components. */ comp = fold_build3 (COMPONENT_REF, ctype, decl, cdecl, NULL_TREE); /* Add reference to '$data' component. */ - tmp = c->ts.u.derived->components->backend_decl; + tmp = CLASS_DATA (c)->backend_decl; comp = fold_build3 (COMPONENT_REF, TREE_TYPE (tmp), comp, tmp, NULL_TREE); tmp = fold_build2 (MODIFY_EXPR, void_type_node, comp, |