diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-07-26 22:42:49 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-07-26 22:42:49 +0000 |
| commit | 9cd74e8fa89a528c779bbc9f31a2b362db9c12ec (patch) | |
| tree | 3652c0abb2804401a42963631a45e70dce5f6d6c | |
| parent | 0d48446ff30d6e0178f3d40bf1d20ea8ca19bd4c (diff) | |
| download | gcc-9cd74e8fa89a528c779bbc9f31a2b362db9c12ec.zip gcc-9cd74e8fa89a528c779bbc9f31a2b362db9c12ec.tar.gz gcc-9cd74e8fa89a528c779bbc9f31a2b362db9c12ec.tar.bz2 | |
re PR fortran/71862 (ICE in gfc_add_component_ref, at fortran/class.c:241)
2016-07-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/71862
* class.c: Remove assert. Iterate over component only if non-null.
2016-07-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/71862
* gfortran.dg/pr71862.f90: New test.
From-SVN: r238774
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/class.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr71862.f90 | 16 |
4 files changed, 34 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b056e0e..0847e64 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2016-07-26 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/71862 + * class.c: Remove assert. Iterate over component only if non-null. + 2016-07-22 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/71935 diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index a627448..6d324a6 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -238,12 +238,14 @@ gfc_add_component_ref (gfc_expr *e, const char *name) /* Avoid losing memory. */ gfc_free_ref_list (*tail); c = gfc_find_component (derived, name, true, true, tail); - gcc_assert (c); - for (ref = *tail; ref->next; ref = ref->next) - ; - ref->next = next; - if (!next) - e->ts = c->ts; + + if (c) { + for (ref = *tail; ref->next; ref = ref->next) + ; + ref->next = next; + if (!next) + e->ts = c->ts; + } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 23a3062..3c335c6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-07-26 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/71862 + * gfortran.dg/pr71862.f90: New test. + 2016-07-26 Martin Sebor <msebor@redhat.com> * gcc.dg/atomic/pr71675.c: Replace the unsupported c11 target diff --git a/gcc/testsuite/gfortran.dg/pr71862.f90 b/gcc/testsuite/gfortran.dg/pr71862.f90 new file mode 100644 index 0000000..411bfc2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr71862.f90 @@ -0,0 +1,16 @@ +! { dg-do compile } +program p + type t + integer :: n = 0 + integer, pointer :: q => null() + end type + type(t) :: x + print *, associated(x%q) + x = f() + print *, associated(x%q) +contains + function f() result (z) ! { dg-error "must be dummy, allocatable or pointer" } + class(t) :: z + print *, associated(z%q) + end +end |