From e1e3b9d3359ea668c7581f6673bdeeb59b085d24 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 12 Apr 2013 10:54:15 +0200 Subject: re PR fortran/56845 ([OOP] _vptr not set to declared type for CLASS + SAVE) 2013-04-12 Tobias Burnus PR fortran/56845 * trans-decl.c (gfc_trans_deferred_vars): Restrict static CLASS init to SAVE and -fno-automatic. 2013-04-12 Tobias Burnus PR fortran/56845 * gfortran.dg/class_allocate_15.f90: New. Revert: 2013-04-12 Tobias Burnus * gfortran.dg/coarray_lib_alloc_2.f90: Update scan-tree-dump-times. From-SVN: r197848 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-decl.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') 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 PR fortran/56845 + * trans-decl.c (gfc_trans_deferred_vars): Restrict + static CLASS init to SAVE and -fno-automatic. + +2013-04-12 Tobias Burnus + + 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; -- cgit v1.1