diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2022-03-07 22:11:33 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2022-03-07 22:11:33 +0100 |
| commit | c0134b7383992aab5c1a91440dbdd8fbb747169c (patch) | |
| tree | 87826e4663529b063bd93fe9435017d5e2549620 /gcc/fortran | |
| parent | 0af37ad4422052be4b7f779737e14c80e57d0ad9 (diff) | |
| download | gcc-c0134b7383992aab5c1a91440dbdd8fbb747169c.zip gcc-c0134b7383992aab5c1a91440dbdd8fbb747169c.tar.gz gcc-c0134b7383992aab5c1a91440dbdd8fbb747169c.tar.bz2 | |
Fortran: Fix gfc_maybe_dereference_var [PR104430][PR99585]
PR fortran/99585
PR fortran/104430
gcc/fortran/ChangeLog:
* trans-expr.cc (conv_parent_component_references): Fix comment;
simplify comparison.
(gfc_maybe_dereference_var): Avoid d referencing a nonpointer.
gcc/testsuite/ChangeLog:
* gfortran.dg/class_result_10.f90: New test.
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/trans-expr.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index c9d9a91..71d0371 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -2805,9 +2805,9 @@ conv_parent_component_references (gfc_se * se, gfc_ref * ref) dt = ref->u.c.sym; c = ref->u.c.component; - /* Return if the component is in the parent type. */ + /* Return if the component is in this type, i.e. not in the parent type. */ for (cmp = dt->components; cmp; cmp = cmp->next) - if (strcmp (c->name, cmp->name) == 0) + if (c == cmp) return; /* Build a gfc_ref to recursively call gfc_conv_component_ref. */ @@ -2867,6 +2867,8 @@ tree gfc_maybe_dereference_var (gfc_symbol *sym, tree var, bool descriptor_only_p, bool is_classarray) { + if (!POINTER_TYPE_P (TREE_TYPE (var))) + return var; if (is_CFI_desc (sym, NULL)) return build_fold_indirect_ref_loc (input_location, var); |