diff options
| author | Tobias Burnus <burnus@net-b.de> | 2008-09-24 09:01:18 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2008-09-24 09:01:18 +0200 |
| commit | a9b98c2c559e553035ca5115cd0cbb9f2c32dab0 (patch) | |
| tree | c0506931aec66b48c8d93f6b98854e14ef6028c2 /gcc | |
| parent | 34971398456227555b7ca26065816d8316169ed7 (diff) | |
| download | gcc-a9b98c2c559e553035ca5115cd0cbb9f2c32dab0.zip gcc-a9b98c2c559e553035ca5115cd0cbb9f2c32dab0.tar.gz gcc-a9b98c2c559e553035ca5115cd0cbb9f2c32dab0.tar.bz2 | |
re PR fortran/37626 (ICE for automatic deallocation of character result variable)
2008-09-24 Tobias Burnus <burnus@net-b.de>
PR fortran/37626
* trans-array.c (gfc_trans_deferred_array): Don't auto-deallocate
result variables.
2008-09-24 Tobias Burnus <burnus@net-b.de>
PR fortran/37626
* gfortran.dg/allocatable_function_4.f90: New test.
From-SVN: r140624
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/allocatable_function_4.f90 | 56 |
4 files changed, 68 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1210d39..3d99ae3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-09-24 Tobias Burnus <burnus@net-b.de> + + PR fortran/37626 + * trans-array.c (gfc_trans_deferred_array): Don't auto-deallocate + result variables. + 2008-09-23 Daniel Kraft <d@domob.eu> PR fortran/37588 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 42b9967..c5aff65 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5754,7 +5754,7 @@ gfc_trans_deferred_array (gfc_symbol * sym, tree body) gfc_add_expr_to_block (&fnblock, tmp); } - if (sym->attr.allocatable && !sym->attr.save) + if (sym->attr.allocatable && !sym->attr.save && !sym->attr.result) { tmp = gfc_trans_dealloc_allocated (sym->backend_decl); gfc_add_expr_to_block (&fnblock, tmp); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 411cf0c..aa736dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-24 Tobias Burnus <burnus@net-b.de> + + PR fortran/37626 + * gfortran.dg/allocatable_function_4.f90: New test. + 2008-09-23 Steve Ellcey <sje@cup.hp.com> * lib/target-supports.exp (check_effective_target_pow10): New. diff --git a/gcc/testsuite/gfortran.dg/allocatable_function_4.f90 b/gcc/testsuite/gfortran.dg/allocatable_function_4.f90 new file mode 100644 index 0000000..9aff3a8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/allocatable_function_4.f90 @@ -0,0 +1,56 @@ +! { dg-do compile } +! { dg-options "-fdump-tree-original" } +! +! PR fortran/37626 +! Contributed by Rich Townsend +! +! The problem was an ICE when trying to deallocate the +! result variable "x_unique". +! +function unique_A (x, sorted) result (x_unique) + implicit none + character(*), dimension(:), intent(in) :: x + logical, intent(in), optional :: sorted + character(LEN(x)), dimension(:), allocatable :: x_unique + + logical :: sorted_ + character(LEN(x)), dimension(SIZE(x)) :: x_sorted + integer :: n_x + logical, dimension(SIZE(x)) :: mask + + integer, external :: b3ss_index + +! Set up sorted_ + + if(PRESENT(sorted)) then + sorted_ = sorted + else + sorted_ = .FALSE. + endif + +! If necessary, sort x + + if(sorted_) then + x_sorted = x + else + x_sorted = x(b3ss_index(x)) + endif + +! Set up the unique array + + n_x = SIZE(x) + + mask = (/.TRUE.,x_sorted(2:n_x) /= x_sorted(1:n_x-1)/) + + allocate(x_unique(COUNT(mask))) + + x_unique = PACK(x_sorted, MASK=mask) + +! Finish + + return +end function unique_A + +! { dg-final { scan-tree-dump-times "__builtin_free" 5 "original" } } +! { dg-final { cleanup-tree-dump "original" } } + |