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 /gcc/fortran/resolve.c | |
| 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
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 4 |
1 files changed, 2 insertions, 2 deletions
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", |