diff options
| author | Andre Vehreschild <vehre@gcc.gnu.org> | 2016-06-05 19:20:54 +0200 |
|---|---|---|
| committer | Andre Vehreschild <vehre@gcc.gnu.org> | 2016-06-05 19:20:54 +0200 |
| commit | b2d83bd2c78021ed68b04c9d426925ef947dddaf (patch) | |
| tree | ee59ef2501c0185b00fd3015378c8c282a5e083d /gcc | |
| parent | ec81960e85d5b9957f96dfda3b7c411c3d548f6b (diff) | |
| download | gcc-b2d83bd2c78021ed68b04c9d426925ef947dddaf.zip gcc-b2d83bd2c78021ed68b04c9d426925ef947dddaf.tar.gz gcc-b2d83bd2c78021ed68b04c9d426925ef947dddaf.tar.bz2 | |
re PR fortran/69659 (ICE on using option -frepack-arrays, in gfc_conv_descriptor_data_get)
gcc/testsuite/ChangeLog:
2016-06-05 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/69659
* gfortran.dg/class_array_22.f03: New test.
gcc/fortran/ChangeLog:
2016-06-05 Andre Vehreschild <vehre@gcc.gnu.org>
PR fortran/69659
* trans-array.c (gfc_trans_dummy_array_bias): For class arrays use
the address of the _data component to reference the arrays data
component.
From-SVN: r237105
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_array_22.f03 | 25 |
4 files changed, 43 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8c04089..e6edc16 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-06-05 Andre Vehreschild <vehre@gcc.gnu.org> + + PR fortran/69659 + * trans-array.c (gfc_trans_dummy_array_bias): For class arrays use + the address of the _data component to reference the arrays data + component. + 2016-06-03 Chung-Lin Tang <cltang@codesourcery.com> * trans-openmp.c (gfc_trans_omp_reduction_list): Add mark_addressable diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 7be301d..403ce3a 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6386,7 +6386,12 @@ gfc_trans_dummy_array_bias (gfc_symbol * sym, tree tmpdesc, stmtCleanup = gfc_finish_block (&cleanup); /* Only do the cleanup if the array was repacked. */ - tmp = build_fold_indirect_ref_loc (input_location, dumdesc); + if (is_classarray) + /* For a class array the dummy array descriptor is in the _class + component. */ + tmp = gfc_class_data_get (dumdesc); + else + tmp = build_fold_indirect_ref_loc (input_location, dumdesc); tmp = gfc_conv_descriptor_data_get (tmp); tmp = fold_build2_loc (input_location, NE_EXPR, boolean_type_node, tmp, tmpdesc); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7a552d3..583a7cf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-06-05 Andre Vehreschild <vehre@gcc.gnu.org> + + PR fortran/69659 + * gfortran.dg/class_array_22.f03: New test. + 2016-06-05 Jan Hubicka <hubicka@ucw.cz> * gcc.dg/tree-prof/peel-1.c: Fix testcase. diff --git a/gcc/testsuite/gfortran.dg/class_array_22.f03 b/gcc/testsuite/gfortran.dg/class_array_22.f03 new file mode 100644 index 0000000..9410741 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_array_22.f03 @@ -0,0 +1,25 @@ +! { dg-do compile } +! { dg-options "-frepack-arrays " } +! +! Original class_array_11.f03 but with -frepack-arrays a new +! ICE was produced reported in +! PR fortran/69659 +! +! Original testcase by Ian Harvey <ian_harvey@bigpond.com> +! Reduced by Janus Weil <Janus@gcc.gnu.org> + + IMPLICIT NONE + + TYPE :: ParentVector + INTEGER :: a + END TYPE ParentVector + +CONTAINS + + SUBROUTINE vector_operation(pvec) + CLASS(ParentVector), INTENT(INOUT) :: pvec(:) + print *,pvec(1)%a + END SUBROUTINE + +END + |