diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 8 | ||||
| -rw-r--r-- | gcc/fortran/invoke.texi | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr80668.f90 | 29 |
5 files changed, 49 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a364e44..e978f32 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2017-05-17 Fritz Reese <fritzoreese@gmail.com> + + PR fortran/80668 + * expr.c (component_initializer): Don't generate initializers for + pointer components. + * invoke.texi (-finit-derived): Document. + 2017-05-16 Paul Thomas <pault@gcc.gnu.org> PR fortran/80554 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index c7d3e54..9b2e565 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4280,9 +4280,13 @@ component_initializer (gfc_typespec *ts, gfc_component *c, bool generate) { gfc_expr *init = NULL; - /* See if we can find the initializer immediately. */ + /* See if we can find the initializer immediately. + Some components should never get initializers. */ if (c->initializer || !generate - || (ts->type == BT_CLASS && !c->attr.allocatable)) + || (ts->type == BT_CLASS && !c->attr.allocatable) + || c->attr.pointer + || c->attr.class_pointer + || c->attr.proc_pointer) return c->initializer; /* Recursively handle derived type components. */ diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi index 636432f..8a1d09d 100644 --- a/gcc/fortran/invoke.texi +++ b/gcc/fortran/invoke.texi @@ -1665,6 +1665,8 @@ according to these flags only with @option{-finit-derived}. These options do not initialize @itemize @bullet @item +objects with the POINTER attribute +@item allocatable arrays @item variables that appear in an @code{EQUIVALENCE} statement. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8f62adb..d75f985 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-05-17 Fritz Reese <fritzoreese@gmail.com> + + PR fortran/80668 + * gfortran.dg/pr80668.f90: New. + 2017-05-17 Peter Bergner <bergner@vnet.ibm.com> PR middle-end/80775 diff --git a/gcc/testsuite/gfortran.dg/pr80668.f90 b/gcc/testsuite/gfortran.dg/pr80668.f90 new file mode 100644 index 0000000..63bd0d3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr80668.f90 @@ -0,0 +1,29 @@ +! { dg-do compile } +! { dg-options "-finit-derived -finit-integer=12345678" } +! +! PR fortran/80668 +! +! Test a regression where structure constructor expressions were created for +! POINTER components with -finit-derived. +! + +MODULE pr80668 + IMPLICIT NONE + TYPE :: dist_t + INTEGER :: TYPE,nblks_loc,nblks + INTEGER,DIMENSION(:),POINTER :: dist + END TYPE dist_t + +CONTAINS + + SUBROUTINE hfx_new() + TYPE(dist_t) :: dist + integer,pointer :: bob + CALL release_dist(dist, bob) + END SUBROUTINE hfx_new + + SUBROUTINE release_dist(dist,p) + TYPE(dist_t) :: dist + integer, pointer, intent(in) :: p + END SUBROUTINE release_dist +END MODULE |