diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_63.f90 | 80 |
4 files changed, 93 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a871fc2..7ad2427 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2017-10-28 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/81758 + * trans-expr.c (trans_class_vptr_len_assignment): 'vptr_expr' + must only be set if the right hand side expression is of type + class. + 2017-10-27 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/82620 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 4e8bfc5..71ec176 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -8053,7 +8053,7 @@ trans_class_vptr_len_assignment (stmtblock_t *block, gfc_expr * le, { /* Get the vptr from the rhs expression only, when it is variable. Functions are expected to be assigned to a temporary beforehand. */ - vptr_expr = re->expr_type == EXPR_VARIABLE + vptr_expr = (re->expr_type == EXPR_VARIABLE && re->ts.type == BT_CLASS) ? gfc_find_and_cut_at_last_class_ref (re) : NULL; if (vptr_expr != NULL && vptr_expr->ts.type == BT_CLASS) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e4e6ee1..1646f4c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-28 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/81758 + * gfortran.dg/class_63.f90: New test. + 2017-10-27 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/82620 diff --git a/gcc/testsuite/gfortran.dg/class_63.f90 b/gcc/testsuite/gfortran.dg/class_63.f90 new file mode 100644 index 0000000..cf99bcf --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_63.f90 @@ -0,0 +1,80 @@ +! { dg-do run } +! +! Tests the fix for PR81758, in which the vpointer for 'ptr' in +! function 'pointer_value' would be set to the vtable of the component +! 'container' rather than that of the component 'vec_elem'. In this test +! case it is ensured that there is a single typebound procedure for both +! types, so that different values are returned. In the original problem +! completely different procedures were involved so that a segfault resulted. +! +! Reduced from the original code of Dimitry Liakh <liakhdi@ornl.gov> by +! Paul Thomas <pault@gcc.gnu.org> +! +module types + type, public:: gfc_container_t + contains + procedure, public:: get_value => ContTypeGetValue + end type gfc_container_t + + !Element of a container: + type, public:: gfc_cont_elem_t + integer :: value_p + contains + procedure, public:: get_value => ContElemGetValue + end type gfc_cont_elem_t + + !Vector element: + type, extends(gfc_cont_elem_t), public:: vector_elem_t + end type vector_elem_t + + !Vector: + type, extends(gfc_container_t), public:: vector_t + type(vector_elem_t), allocatable, private :: vec_elem + end type vector_t + + type, public :: vector_iter_t + class(vector_t), pointer, private :: container => NULL() + contains + procedure, public:: get_vector_value => vector_Value + procedure, public:: get_pointer_value => pointer_value + end type + +contains + integer function ContElemGetValue (this) + class(gfc_cont_elem_t) :: this + ContElemGetValue = this%value_p + end function + + integer function ContTypeGetValue (this) + class(gfc_container_t) :: this + ContTypeGetValue = 0 + end function + + integer function vector_Value (this) + class(vector_iter_t) :: this + vector_value = this%container%vec_elem%get_value() + end function + + integer function pointer_value (this) + class(vector_iter_t), target :: this + class(gfc_cont_elem_t), pointer :: ptr + ptr => this%container%vec_elem + pointer_value = ptr%get_value() + end function + + subroutine factory (arg) + class (vector_iter_t), pointer :: arg + allocate (vector_iter_t :: arg) + allocate (vector_t :: arg%container) + allocate (arg%container%vec_elem) + arg%container%vec_elem%value_p = 99 + end subroutine +end module + + use types + class (vector_iter_t), pointer :: x + + call factory (x) + if (x%get_vector_value() .ne. 99) call abort + if (x%get_pointer_value() .ne. 99) call abort +end |