diff options
| author | Bernhard Reutner-Fischer <aldot@gcc.gnu.org> | 2023-05-18 18:04:10 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <aldot@gcc.gnu.org> | 2023-05-19 20:45:39 +0200 |
| commit | 05b7cc7daac8b3c275bbe85194e1bb4f6e29b19c (patch) | |
| tree | 388b73d83986867033471c991c0fe5154dc55e35 /gcc/fortran/simplify.cc | |
| parent | cddb6dd6668843db351807ab8d2ff7440109f39a (diff) | |
| download | gcc-05b7cc7daac8b3c275bbe85194e1bb4f6e29b19c.zip gcc-05b7cc7daac8b3c275bbe85194e1bb4f6e29b19c.tar.gz gcc-05b7cc7daac8b3c275bbe85194e1bb4f6e29b19c.tar.bz2 | |
fortran: Use CLASS_DATA from gfortran.h
gcc/fortran/ChangeLog:
* expr.cc (gfc_get_corank): Use CLASS_DATA from gfortran.h.
* resolve.cc (resolve_component): Same.
(resolve_fl_derived0): Same.
* simplify.cc (gfc_simplify_extends_type_of): Same.
(simplify_cobound): Same.
Diffstat (limited to 'gcc/fortran/simplify.cc')
| -rw-r--r-- | gcc/fortran/simplify.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index a7b4784..6ba2040 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -3116,28 +3116,28 @@ gfc_simplify_extends_type_of (gfc_expr *a, gfc_expr *mold) /* Return .false. if the dynamic type can never be an extension. */ if ((a->ts.type == BT_CLASS && mold->ts.type == BT_CLASS && !gfc_type_is_extension_of - (mold->ts.u.derived->components->ts.u.derived, - a->ts.u.derived->components->ts.u.derived) + (CLASS_DATA (mold)->ts.u.derived, + CLASS_DATA (a)->ts.u.derived) && !gfc_type_is_extension_of - (a->ts.u.derived->components->ts.u.derived, - mold->ts.u.derived->components->ts.u.derived)) + (CLASS_DATA (a)->ts.u.derived, + CLASS_DATA (mold)->ts.u.derived)) || (a->ts.type == BT_DERIVED && mold->ts.type == BT_CLASS && !gfc_type_is_extension_of - (mold->ts.u.derived->components->ts.u.derived, + (CLASS_DATA (mold)->ts.u.derived, a->ts.u.derived)) || (a->ts.type == BT_CLASS && mold->ts.type == BT_DERIVED && !gfc_type_is_extension_of (mold->ts.u.derived, - a->ts.u.derived->components->ts.u.derived) + CLASS_DATA (a)->ts.u.derived) && !gfc_type_is_extension_of - (a->ts.u.derived->components->ts.u.derived, + (CLASS_DATA (a)->ts.u.derived, mold->ts.u.derived))) return gfc_get_logical_expr (gfc_default_logical_kind, &a->where, false); /* Return .true. if the dynamic type is guaranteed to be an extension. */ if (a->ts.type == BT_CLASS && mold->ts.type == BT_DERIVED && gfc_type_is_extension_of (mold->ts.u.derived, - a->ts.u.derived->components->ts.u.derived)) + CLASS_DATA (a)->ts.u.derived)) return gfc_get_logical_expr (gfc_default_logical_kind, &a->where, true); return NULL; @@ -4344,8 +4344,8 @@ simplify_cobound (gfc_expr *array, gfc_expr *dim, gfc_expr *kind, int upper) return NULL; /* Follow any component references. */ - as = (array->ts.type == BT_CLASS && array->ts.u.derived->components) - ? array->ts.u.derived->components->as + as = (array->ts.type == BT_CLASS && CLASS_DATA (array)) + ? CLASS_DATA (array)->as : array->symtree->n.sym->as; for (ref = array->ref; ref; ref = ref->next) { |