diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 1 | ||||
| -rw-r--r-- | gcc/fortran/iresolve.c | 8 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 1 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fff5058..535a5c1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,16 @@ 2016-11-07 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/78226 + * expr.c (gfc_generate_initializer): Add where to EXPR_NULL + statement. + * iresolve.c (gfc_resolve_extends_type_of): Add where to + both arguments of the function. + * resolve.c (resolve_select_type): Add where to the + second argument of the new statement. + +2016-11-07 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/78226 * match.c (gfc_match_select_type): Add where for expr1. * resolve.c (resolev_select_type): Add where for expr1 of new statement. diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 0e94ae8..ba79190 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4367,6 +4367,7 @@ gfc_generate_initializer (gfc_typespec *ts, bool generate) { ctor->expr = gfc_get_expr (); ctor->expr->expr_type = EXPR_NULL; + ctor->expr->where = init->where; ctor->expr->ts = comp->ts; } diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c index 078e47d..b289c9f 100644 --- a/gcc/fortran/iresolve.c +++ b/gcc/fortran/iresolve.c @@ -1044,15 +1044,19 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo) gfc_add_vptr_component (a); else if (a->ts.type == BT_DERIVED) { + locus where; + vtab = gfc_find_derived_vtab (a->ts.u.derived); /* Clear the old expr. */ gfc_free_ref_list (a->ref); + where = a->where; memset (a, '\0', sizeof (gfc_expr)); /* Construct a new one. */ a->expr_type = EXPR_VARIABLE; st = gfc_find_symtree (vtab->ns->sym_root, vtab->name); a->symtree = st; a->ts = vtab->ts; + a->where = where; } /* Replace the second argument with the corresponding vtab. */ @@ -1060,8 +1064,11 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo) gfc_add_vptr_component (mo); else if (mo->ts.type == BT_DERIVED) { + locus where; + vtab = gfc_find_derived_vtab (mo->ts.u.derived); /* Clear the old expr. */ + where = mo->where; gfc_free_ref_list (mo->ref); memset (mo, '\0', sizeof (gfc_expr)); /* Construct a new one. */ @@ -1069,6 +1076,7 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo) st = gfc_find_symtree (vtab->ns->sym_root, vtab->name); mo->symtree = st; mo->ts = vtab->ts; + mo->where = where; } f->ts.type = BT_LOGICAL; diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index f4b1283..3a4dd1f 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -8863,6 +8863,7 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns) st = gfc_find_symtree (vtab->ns->sym_root, vtab->name); new_st->expr1->value.function.actual->next = gfc_get_actual_arglist (); new_st->expr1->value.function.actual->next->expr = gfc_get_variable_expr (st); + new_st->expr1->value.function.actual->next->expr->where = code->loc; new_st->next = body->next; } if (default_case->next) |