OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tobias Burnus 2008-09-24 09:01:18 +02:00 committed by Tobias Burnus
parent 3497139845
commit a9b98c2c55
4 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -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

2
gcc/fortran/trans-array.c
View File

@ -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);

5
gcc/testsuite/ChangeLog
View File

@ -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.

56
gcc/testsuite/gfortran.dg/allocatable_function_4.f90 Normal file
View File

@ -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" } }