diff options
| author | Fritz Reese <fritzoreese@gmail.com> | 2016-10-07 21:25:16 +0000 |
|---|---|---|
| committer | Fritz Reese <foreese@gcc.gnu.org> | 2016-10-07 21:25:16 +0000 |
| commit | 56d3a930ae50cd8ab744a1d2ea4ed803995b47bf (patch) | |
| tree | b20a99f78f375d2406e8f4099deeabf3092129fa /gcc/fortran/interface.c | |
| parent | 45e2bf2e5e370e62c3cef575b6726dc936a45599 (diff) | |
| download | gcc-56d3a930ae50cd8ab744a1d2ea4ed803995b47bf.zip gcc-56d3a930ae50cd8ab744a1d2ea4ed803995b47bf.tar.gz gcc-56d3a930ae50cd8ab744a1d2ea4ed803995b47bf.tar.bz2 | |
Fix ICE due to map typespecs with different sized charlens being copied.
2016-10-07 Fritz Reese <fritzoreese@gmail.com>
Fix ICE due to map typespecs with different sized charlens being copied.
gcc/fortran/
* interface.c (compare_components): Check charlen for BT_CHAR.
gcc/testsuite/gfortran.dg/
* dec_union_11.f90: New testcase.
From-SVN: r240875
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 2a9af0f..dc81ab5 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -495,6 +495,17 @@ compare_components (gfc_component *cmp1, gfc_component *cmp2, if (cmp1->attr.dimension && gfc_compare_array_spec (cmp1->as, cmp2->as) == 0) return 0; + if (cmp1->ts.type == BT_CHARACTER && cmp2->ts.type == BT_CHARACTER) + { + gfc_charlen *l1 = cmp1->ts.u.cl; + gfc_charlen *l2 = cmp2->ts.u.cl; + if (l1 && l2 && l1->length && l2->length + && l1->length->expr_type == EXPR_CONSTANT + && l2->length->expr_type == EXPR_CONSTANT + && gfc_dep_compare_expr (l1->length, l2->length) != 0) + return 0; + } + /* Make sure that link lists do not put this function into an endless recursive loop! */ if (!(cmp1->ts.type == BT_DERIVED && derived1 == cmp1->ts.u.derived) |