diff options
| author | Fritz Reese <fritzoreese@gmail.com> | 2016-10-05 20:24:48 +0000 |
|---|---|---|
| committer | Fritz Reese <foreese@gcc.gnu.org> | 2016-10-05 20:24:48 +0000 |
| commit | 908b82964e0985f2f97e5848ba10cda7e77ce8cb (patch) | |
| tree | cfed710cce62e264fecedd6ec5bb21f948f6c83a /gcc/fortran/interface.c | |
| parent | 3bd034d0181e3f8ed26baac2e69c6b3bba2eb05c (diff) | |
| download | gcc-908b82964e0985f2f97e5848ba10cda7e77ce8cb.zip gcc-908b82964e0985f2f97e5848ba10cda7e77ce8cb.tar.gz gcc-908b82964e0985f2f97e5848ba10cda7e77ce8cb.tar.bz2 | |
Fix ICE due to comparison between UNION components.
2016-10-05 Fritz Reese <fritzoreese@gmail.com>
Fix ICE due to comparison between UNION components.
gcc/fortran/
* interface.c (gfc_compare_types): Don't compare BT_UNION components
until we know they're both UNIONs.
* interface.c (gfc_compare_union_types): Guard against empty
components.
gcc/testsuite/gfortran.dg/
* dec_union_9.f90: New testcase.
* dec_union_10.f90: New testcase.
From-SVN: r240810
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 04ad0e2..e7f1878 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -531,6 +531,12 @@ gfc_compare_union_types (gfc_symbol *un1, gfc_symbol *un2) if (un1->attr.flavor != FL_UNION || un2->attr.flavor != FL_UNION) return 0; + if (un1->attr.zero_comp != un2->attr.zero_comp) + return 0; + + if (un1->attr.zero_comp) + return 1; + map1 = un1->components; map2 = un2->components; @@ -694,13 +700,14 @@ gfc_compare_types (gfc_typespec *ts1, gfc_typespec *ts2) && (ts1->u.derived->attr.sequence || ts1->u.derived->attr.is_bind_c)) return 1; - if (ts1->type == BT_UNION && ts2->type == BT_UNION) - return gfc_compare_union_types (ts1->u.derived, ts2->u.derived); - if (ts1->type != ts2->type - && ((!gfc_bt_struct (ts1->type) && ts1->type != BT_CLASS) - || (!gfc_bt_struct (ts2->type) && ts2->type != BT_CLASS))) + && ((ts1->type != BT_DERIVED && ts1->type != BT_CLASS) + || (ts2->type != BT_DERIVED && ts2->type != BT_CLASS))) return 0; + + if (ts1->type == BT_UNION) + return gfc_compare_union_types (ts1->u.derived, ts2->u.derived); + if (ts1->type != BT_DERIVED && ts1->type != BT_CLASS) return (ts1->kind == ts2->kind); |