diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2019-01-08 20:29:01 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2019-01-08 20:29:01 +0100 |
| commit | 903ecc6c2a564e4d3754082e2025e1d80fddf5a4 (patch) | |
| tree | 6c542493d79d23d00525cdf2894dbeeee6e35f86 | |
| parent | 6976bc87f162c542c2b92ee222401150af3fcc34 (diff) | |
| download | gcc-903ecc6c2a564e4d3754082e2025e1d80fddf5a4.zip gcc-903ecc6c2a564e4d3754082e2025e1d80fddf5a4.tar.gz gcc-903ecc6c2a564e4d3754082e2025e1d80fddf5a4.tar.bz2 | |
re PR fortran/88047 (ICE in gfc_find_vtab, at fortran/class.c:2843)
2019-01-08 Janus Weil <janus@gcc.gnu.org>
PR fortran/88047
* class.c (gfc_find_vtab): For polymorphic typespecs, the components of
the class container may not be available (in case of invalid code).
2019-01-08 Janus Weil <janus@gcc.gnu.org>
PR fortran/88047
* gfortran.dg/class_69.f90: New test case.
From-SVN: r267735
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/class.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_69.f90 | 21 |
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 73d47da..f29be83 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-01-08 Janus Weil <janus@gcc.gnu.org> + + PR fortran/88047 + * class.c (gfc_find_vtab): For polymorphic typespecs, the components of + the class container may not be available (in case of invalid code). + 2019-01-08 Richard Biener <rguenther@suse.de> PR fortran/88611 diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index 77f0fca..8809b5b 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -2846,7 +2846,10 @@ gfc_find_vtab (gfc_typespec *ts) case BT_DERIVED: return gfc_find_derived_vtab (ts->u.derived); case BT_CLASS: - return gfc_find_derived_vtab (ts->u.derived->components->ts.u.derived); + if (ts->u.derived->components && ts->u.derived->components->ts.u.derived) + return gfc_find_derived_vtab (ts->u.derived->components->ts.u.derived); + else + return NULL; default: return find_intrinsic_vtab (ts); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2843929..2c9fe32 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-08 Janus Weil <janus@gcc.gnu.org> + + PR fortran/88047 + * gfortran.dg/class_69.f90: New test case. + 2019-01-08 H.J. Lu <hongjiu.lu@intel.com> PR target/88717 diff --git a/gcc/testsuite/gfortran.dg/class_69.f90 b/gcc/testsuite/gfortran.dg/class_69.f90 new file mode 100644 index 0000000..e45e035 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_69.f90 @@ -0,0 +1,21 @@ +! { dg-do compile } +! +! PR 88047: [9 Regression] ICE in gfc_find_vtab, at fortran/class.c:2843 +! +! Contributed by G. Steinmetz <gscfq@t-online.de> + +subroutine sub_a + type t + end type + class(t) :: x(2) ! { dg-error "must be dummy, allocatable or pointer" } + class(t), parameter :: a(2) = t() ! { dg-error "cannot have the PARAMETER attribute" } + x = a ! { dg-error "Nonallocatable variable must not be polymorphic in intrinsic assignment" } +end + +subroutine sub_b + type t + integer :: n + end type + class(t) :: a, x ! { dg-error "must be dummy, allocatable or pointer" } + x = a ! { dg-error "Nonallocatable variable must not be polymorphic in intrinsic assignment" } +end |