diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2009-04-04 13:19:15 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2009-04-04 13:19:15 +0000 |
| commit | f4c76b9f642225e35a27edb176e0a51b19214455 (patch) | |
| tree | a61d196a99e5fd45472174fc313e65824211f892 | |
| parent | 5bd2d99ca31e0acfa325fb3e0d62321d1756a444 (diff) | |
2009-04-04 Paul Thomas <pault@gcc.gnu.org>
PR fortran/39519
* parse.c (parse_derived): Do not break on finding pointer,
allocatable or private components.
2009-04-04 Paul Thomas <pault@gcc.gnu.org>
PR fortran/39519
* gfortran.dg/alloc_comp_assign_9.f90: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@145538 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/parse.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/alloc_comp_assign_9.f90 | 20 |
4 files changed, 36 insertions, 12 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ed91ac74788..06e76b74b65 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2009-04-04 Paul Thomas <pault@gcc.gnu.org> + + Backport from mainline: + PR fortran/39519 + * parse.c (parse_derived): Do not break on finding pointer, + allocatable or private components. + 2009-04-03 Tobias Burnus <burnus@net-b.de> PR fortran/39594 diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 3e86a43d0b1..64272e2a51e 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -1978,27 +1978,18 @@ endType: /* Look for allocatable components. */ if (c->attr.allocatable || (c->ts.type == BT_DERIVED && c->ts.derived->attr.alloc_comp)) - { - sym->attr.alloc_comp = 1; - break; - } + sym->attr.alloc_comp = 1; /* Look for pointer components. */ if (c->attr.pointer || (c->ts.type == BT_DERIVED && c->ts.derived->attr.pointer_comp)) - { - sym->attr.pointer_comp = 1; - break; - } + sym->attr.pointer_comp = 1; /* Look for private components. */ if (sym->component_access == ACCESS_PRIVATE || c->attr.access == ACCESS_PRIVATE || (c->ts.type == BT_DERIVED && c->ts.derived->attr.private_comp)) - { - sym->attr.private_comp = 1; - break; - } + sym->attr.private_comp = 1; } if (!seen_component) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1a42e6e90fb..f10e4f2787a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-04-04 Paul Thomas <pault@gcc.gnu.org> + + Backport from mainline: + PR fortran/39519 + * gfortran.dg/alloc_comp_assign_9.f90: New test. + 2009-04-03 H.J. Lu <hongjiu.lu@intel.com> Backport from mainline: diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_assign_9.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_assign_9.f90 new file mode 100644 index 00000000000..9051bafa019 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/alloc_comp_assign_9.f90 @@ -0,0 +1,20 @@ +! { dg-do run } +! Test the fix for PR39519, where the presence of the pointer +! as the first component was preventing the second from passing +! the "alloc_comp" attribute to the derived type. +! +! Contributed by Gilbert Scott <gilbert.scott@easynet.co.uk> +! +PROGRAM X + TYPE T + INTEGER, POINTER :: P + INTEGER, ALLOCATABLE :: A(:) + END TYPE T + TYPE(T) :: T1,T2 + ALLOCATE ( T1%A(1) ) + ALLOCATE ( T2%A(1) ) + T1%A = 23 + T2 = T1 + T1%A = 42 + if (T2%A(1) .NE. 23) CALL ABORT +END PROGRAM X |