diff options
| author | Tobias Burnus <burnus@net-b.de> | 2010-10-26 08:49:43 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2010-10-26 08:49:43 +0200 |
| commit | 6739e9ec6e06c73b2426e7a8bbcc6594eda40f7f (patch) | |
| tree | d933685d1b7ebdc28c46d5067c940feaede7020a /gcc | |
| parent | 90ecaf87ff7b69272f0d5a1dd8cbe3a4ec7a9fd8 (diff) | |
| download | gcc-6739e9ec6e06c73b2426e7a8bbcc6594eda40f7f.zip gcc-6739e9ec6e06c73b2426e7a8bbcc6594eda40f7f.tar.gz gcc-6739e9ec6e06c73b2426e7a8bbcc6594eda40f7f.tar.bz2 | |
[multiple changes]
2010-10-26 Tobias Burnus <burnus@net-b.de>
PR fortran/45451
* trans-stmt.c (gfc_trans_allocate): Do a deep-copy for SOURCE=.
PR fortran/43018
* trans-array.c (duplicate_allocatable): Use size of type and not
the size of the pointer to the type.
2010-10-26 Tobias Burnus <burnus@net-b.de>
PR fortran/45451
* gfortran.dg/class_allocate_5.f90: New.
From-SVN: r165936
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans-stmt.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_allocate_5.f90 | 34 |
5 files changed, 54 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 006ea6e..73eb4ad 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2010-10-26 Tobias Burnus <burnus@net-b.de> + + PR fortran/45451 + * trans-stmt.c (gfc_trans_allocate): Do a deep-copy for SOURCE=. + + PR fortran/43018 + * trans-array.c (duplicate_allocatable): Use size of type and not + the size of the pointer to the type. + 2010-10-25 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/46140 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 52ba831..db05734 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6072,7 +6072,7 @@ duplicate_allocatable (tree dest, tree src, tree type, int rank, null_data = gfc_finish_block (&block); gfc_init_block (&block); - size = TYPE_SIZE_UNIT (type); + size = TYPE_SIZE_UNIT (TREE_TYPE (type)); if (!no_malloc) { tmp = gfc_call_malloc (&block, type, size); diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 6e1a20b..d079230 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -4487,8 +4487,12 @@ gfc_trans_allocate (gfc_code * code) /* Initialization via SOURCE block (or static default initializer). */ gfc_expr *rhs = gfc_copy_expr (code->expr3); - if (al->expr->ts.type == BT_CLASS) + if (al->expr->ts.type == BT_CLASS && rhs->expr_type == EXPR_VARIABLE + && rhs->ts.type != BT_CLASS) + tmp = gfc_trans_assignment (expr, rhs, false, false); + else if (al->expr->ts.type == BT_CLASS) { + /* TODO: One needs to do a deep-copy for BT_CLASS; cf. PR 46174. */ gfc_se dst,src; if (rhs->ts.type == BT_CLASS) gfc_add_component_ref (rhs, "$data"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 429ab841..5eb2f5c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-10-26 Tobias Burnus <burnus@net-b.de> + + PR fortran/45451 + * gfortran.dg/class_allocate_5.f90: New. + 2010-10-25 Rodrigo Rivas Costa <rodrigorivascosta@gmail.com> Implement opaque-enum-specifiers for C++0x diff --git a/gcc/testsuite/gfortran.dg/class_allocate_5.f90 b/gcc/testsuite/gfortran.dg/class_allocate_5.f90 new file mode 100644 index 0000000..592161e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_allocate_5.f90 @@ -0,0 +1,34 @@ +! { dg-do run } +! +! PR fortran/45451 +! +! Contributed by Salvatore Filippone and Janus Weil +! +! Check that ALLOCATE with SOURCE= does a deep copy. +! +program bug23 + implicit none + + type :: psb_base_sparse_mat + integer, allocatable :: irp(:) + end type psb_base_sparse_mat + + class(psb_base_sparse_mat), allocatable :: a + type(psb_base_sparse_mat) :: acsr + + allocate(acsr%irp(4)) + acsr%irp(1:4) = (/1,3,4,5/) + + write(*,*) acsr%irp(:) + + allocate(a,source=acsr) + + write(*,*) a%irp(:) + + call move_alloc(acsr%irp, a%irp) + + write(*,*) a%irp(:) + + if (any (a%irp /= [1,3,4,5])) call abort() +end program bug23 + |