diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_allocate_15.f90 | 28 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 | 4 |
5 files changed, 49 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d3c8b58..616680d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,12 @@ 2013-04-12 Tobias Burnus <burnus@net-b.de> PR fortran/56845 + * trans-decl.c (gfc_trans_deferred_vars): Restrict + static CLASS init to SAVE and -fno-automatic. + +2013-04-12 Tobias Burnus <burnus@net-b.de> + + PR fortran/56845 * trans-decl.c (gfc_trans_deferred_vars): Set _vptr for allocatable static BT_CLASS. * trans-expr.c (gfc_class_set_static_fields): New function. diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 779df16..f2cf2de 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -3649,7 +3649,8 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) NULL_TREE); } - if (sym->ts.type == BT_CLASS && TREE_STATIC (sym->backend_decl) + if (sym->ts.type == BT_CLASS + && (sym->attr.save || gfc_option.flag_max_stack_var_size == 0) && CLASS_DATA (sym)->attr.allocatable) { tree vptr; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2c8c878..6272c49 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2013-04-12 Tobias Burnus <burnus@net-b.de> + + PR fortran/56845 + * gfortran.dg/class_allocate_15.f90: New. + + Revert: + 2013-04-12 Tobias Burnus <burnus@net-b.de> + + * gfortran.dg/coarray_lib_alloc_2.f90: Update + scan-tree-dump-times. + 2013-04-12 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/56918 diff --git a/gcc/testsuite/gfortran.dg/class_allocate_15.f90 b/gcc/testsuite/gfortran.dg/class_allocate_15.f90 new file mode 100644 index 0000000..07c1cb4 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_allocate_15.f90 @@ -0,0 +1,28 @@ +! { dg-do run } +! { dg-options "-fdump-tree-original -fdump-tree-original -fmax-stack-var-size=1" } +! +! PR fortran/56845 +! +type t +end type t +type, extends(t) :: t2 +end type t2 +type(t) :: y +call foo() +call bar() +contains + subroutine foo() + class(t), allocatable :: x + if(allocated(x)) call abort() + if(.not.same_type_as(x,y)) call abort() + allocate (t2 :: x) + end + subroutine bar() + class(t), allocatable :: x(:) + if(allocated(x)) call abort() + if(.not.same_type_as(x,y)) call abort() + allocate (t2 :: x(4)) + end +end +! { dg-final { scan-tree-dump-times "__builtin_free" 2 "original" } } +! { dg-final { cleanup-tree-dump "original" } } diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 index a41be79..3aaff1e 100644 --- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 +++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 @@ -18,6 +18,6 @@ ! { dg-final { scan-tree-dump-times "_gfortran_caf_register .1, 1, &yy._data.token, &stat.., &errmsg, 200.;" 1 "original" } } ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx._data.token, &stat.., &errmsg, 200.;" 1 "original" } } ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, &stat.., &errmsg, 200.;" 1 "original" } } -! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, 0B, 0B, 0.;" 0 "original" } } -! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx._data.token, 0B, 0B, 0.;" 0 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, 0B, 0B, 0.;" 1 "original" } } +! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx._data.token, 0B, 0B, 0.;" 1 "original" } } ! { dg-final { cleanup-tree-dump "original" } } |