diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-08-19 00:32:22 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-08-19 00:32:22 +0200 |
| commit | 80f9522847dffe96e819ac730d7caa46ddf101fe (patch) | |
| tree | f271d1f77c0f13161bf127f660a05f91bcca1311 /gcc/fortran/symbol.c | |
| parent | fbb12873f243b8e02582f77950d3a03d7453a0cc (diff) | |
| download | gcc-80f9522847dffe96e819ac730d7caa46ddf101fe.zip gcc-80f9522847dffe96e819ac730d7caa46ddf101fe.tar.gz gcc-80f9522847dffe96e819ac730d7caa46ddf101fe.tar.bz2 | |
re PR fortran/45290 ([F08] pointer initialization)
2010-08-19 Janus Weil <janus@gcc.gnu.org>
PR fortran/45290
* gfortran.h (gfc_add_save): Modified prototype.
* decl.c (add_init_expr_to_sym): Defer checking of proc pointer init.
(match_pointer_init): New function to match F08 pointer initialization.
(variable_decl,match_procedure_decl,match_ppc_decl): Use
'match_pointer_init'.
(match_attr_spec): Module variables are implicitly SAVE.
(gfc_match_save): Modified call to 'gfc_add_save'.
* expr.c (gfc_check_assign_symbol): Extra checks for pointer
initialization.
* primary.c (gfc_variable_attr): Handle SAVE attribute.
* resolve.c (resolve_structure_cons): Add new argument and do pointer
initialization checks.
(gfc_resolve_expr): Modified call to 'resolve_structure_cons'.
(resolve_values): Call 'resolve_structure_cons' directly with init arg.
(resolve_fl_variable): Handle SAVE_IMPLICIT.
* symbol.c (gfc_add_save,gfc_copy_attr,save_symbol): Handle
SAVE_IMPLICIT.
* trans-decl.c (gfc_create_module_variable): Module variables with
TARGET can already exist.
* trans-expr.c (gfc_conv_variable): Check for 'current_function_decl'.
(gfc_conv_initializer): Implement non-NULL pointer
initialization.
2010-08-19 Janus Weil <janus@gcc.gnu.org>
PR fortran/45290
* gfortran.dg/proc_ptr_comp_3.f90: Modified.
* gfortran.dg/pointer_init_2.f90: New.
* gfortran.dg/pointer_init_3.f90: New.
* gfortran.dg/pointer_init_4.f90: New.
From-SVN: r163356
Diffstat (limited to 'gcc/fortran/symbol.c')
| -rw-r--r-- | gcc/fortran/symbol.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index 0199ac4..4d3db86 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -1095,13 +1095,14 @@ gfc_add_result (symbol_attribute *attr, const char *name, locus *where) gfc_try -gfc_add_save (symbol_attribute *attr, const char *name, locus *where) +gfc_add_save (symbol_attribute *attr, save_state s, const char *name, + locus *where) { if (check_used (attr, name, where)) return FAILURE; - if (gfc_pure (NULL)) + if (s == SAVE_EXPLICIT && gfc_pure (NULL)) { gfc_error ("SAVE attribute at %L cannot be specified in a PURE procedure", @@ -1109,7 +1110,7 @@ gfc_add_save (symbol_attribute *attr, const char *name, locus *where) return FAILURE; } - if (attr->save == SAVE_EXPLICIT && !attr->vtab) + if (s == SAVE_EXPLICIT && attr->save == SAVE_EXPLICIT) { if (gfc_notify_std (GFC_STD_LEGACY, "Duplicate SAVE attribute specified at %L", @@ -1118,7 +1119,7 @@ gfc_add_save (symbol_attribute *attr, const char *name, locus *where) return FAILURE; } - attr->save = SAVE_EXPLICIT; + attr->save = s; return check_conflict (attr, name, where); } @@ -1740,7 +1741,7 @@ gfc_copy_attr (symbol_attribute *dest, symbol_attribute *src, locus *where) goto fail; if (src->is_protected && gfc_add_protected (dest, NULL, where) == FAILURE) goto fail; - if (src->save && gfc_add_save (dest, NULL, where) == FAILURE) + if (src->save && gfc_add_save (dest, src->save, NULL, where) == FAILURE) goto fail; if (src->value && gfc_add_value (dest, NULL, where) == FAILURE) goto fail; @@ -3430,7 +3431,7 @@ save_symbol (gfc_symbol *sym) /* Automatic objects are not saved. */ if (gfc_is_var_automatic (sym)) return; - gfc_add_save (&sym->attr, sym->name, &sym->declared_at); + gfc_add_save (&sym->attr, SAVE_EXPLICIT, sym->name, &sym->declared_at); } |