diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2011-11-09 10:45:36 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2011-11-09 10:45:36 +0100 |
| commit | 9c63ca5a1da8f003feff00d808d5d67931038d29 (patch) | |
| tree | fd0cad36550bc533efd5247a37f76d9bec96615d | |
| parent | 02c74373cf0a29074e52b42827622c8bbb0b716a (diff) | |
| download | gcc-9c63ca5a1da8f003feff00d808d5d67931038d29.zip gcc-9c63ca5a1da8f003feff00d808d5d67931038d29.tar.gz gcc-9c63ca5a1da8f003feff00d808d5d67931038d29.tar.bz2 | |
re PR fortran/50960 ([OOP] vtables not marked as constant)
2011-11-09 Janus Weil <janus@gcc.gnu.org>
PR fortran/50960
* class.c (gfc_find_derived_vtab): Make the vtab symbols FL_PARAMETER.
* expr.c (gfc_simplify_expr): Prevent vtabs from being replaced with
their value.
* resolve.c (resolve_values): Use-associated symbols do not need to
be resolved again.
(resolve_fl_parameter): Make sure the symbol has a value.
From-SVN: r181199
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/class.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1fffbc60..4b65c73 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2011-11-09 Janus Weil <janus@gcc.gnu.org> + + PR fortran/50960 + * class.c (gfc_find_derived_vtab): Make the vtab symbols FL_PARAMETER. + * expr.c (gfc_simplify_expr): Prevent vtabs from being replaced with + their value. + * resolve.c (resolve_values): Use-associated symbols do not need to + be resolved again. + (resolve_fl_parameter): Make sure the symbol has a value. + 2011-11-08 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/38718 diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c index 574d22b..dc76ad1 100644 --- a/gcc/fortran/class.c +++ b/gcc/fortran/class.c @@ -428,7 +428,7 @@ gfc_find_derived_vtab (gfc_symbol *derived) { gfc_get_symbol (name, ns, &vtab); vtab->ts.type = BT_DERIVED; - if (gfc_add_flavor (&vtab->attr, FL_VARIABLE, NULL, + if (gfc_add_flavor (&vtab->attr, FL_PARAMETER, NULL, &gfc_current_locus) == FAILURE) goto cleanup; vtab->attr.target = 1; diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index f241455..8817c2c 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1883,7 +1883,8 @@ gfc_simplify_expr (gfc_expr *p, int type) initialization expression, or we want a subsection. */ if (p->symtree->n.sym->attr.flavor == FL_PARAMETER && (gfc_init_expr_flag || p->ref - || p->symtree->n.sym->value->expr_type != EXPR_ARRAY)) + || p->symtree->n.sym->value->expr_type != EXPR_ARRAY) + && !p->symtree->n.sym->attr.vtab) { if (simplify_parameter_variable (p, type) == FAILURE) return FAILURE; diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 0e88239..0a8fac6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9514,7 +9514,7 @@ resolve_values (gfc_symbol *sym) { gfc_try t; - if (sym->value == NULL) + if (sym->value == NULL || sym->attr.use_assoc) return; if (sym->value->expr_type == EXPR_STRUCTURE) @@ -11982,7 +11982,7 @@ resolve_fl_parameter (gfc_symbol *sym) /* Make sure the types of derived parameters are consistent. This type checking is deferred until resolution because the type may refer to a derived type from the host. */ - if (sym->ts.type == BT_DERIVED + if (sym->ts.type == BT_DERIVED && sym->value && !gfc_compare_types (&sym->ts, &sym->value->ts)) { gfc_error ("Incompatible derived type in PARAMETER at %L", |