Commit 39b4b34d by Thomas Koenig

re PR fortran/78226 (Fill out location information everywhere)

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.

From-SVN: r241927
parent 98a98909
2016-11-07 Thomas Koenig <tkoenig@gcc.gnu.org> 2016-11-07 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/78226 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. * match.c (gfc_match_select_type): Add where for expr1.
* resolve.c (resolev_select_type): Add where for expr1 of new * resolve.c (resolev_select_type): Add where for expr1 of new
statement. statement.
......
...@@ -4367,6 +4367,7 @@ gfc_generate_initializer (gfc_typespec *ts, bool generate) ...@@ -4367,6 +4367,7 @@ gfc_generate_initializer (gfc_typespec *ts, bool generate)
{ {
ctor->expr = gfc_get_expr (); ctor->expr = gfc_get_expr ();
ctor->expr->expr_type = EXPR_NULL; ctor->expr->expr_type = EXPR_NULL;
ctor->expr->where = init->where;
ctor->expr->ts = comp->ts; ctor->expr->ts = comp->ts;
} }
......
...@@ -1044,15 +1044,19 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo) ...@@ -1044,15 +1044,19 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo)
gfc_add_vptr_component (a); gfc_add_vptr_component (a);
else if (a->ts.type == BT_DERIVED) else if (a->ts.type == BT_DERIVED)
{ {
locus where;
vtab = gfc_find_derived_vtab (a->ts.u.derived); vtab = gfc_find_derived_vtab (a->ts.u.derived);
/* Clear the old expr. */ /* Clear the old expr. */
gfc_free_ref_list (a->ref); gfc_free_ref_list (a->ref);
where = a->where;
memset (a, '\0', sizeof (gfc_expr)); memset (a, '\0', sizeof (gfc_expr));
/* Construct a new one. */ /* Construct a new one. */
a->expr_type = EXPR_VARIABLE; a->expr_type = EXPR_VARIABLE;
st = gfc_find_symtree (vtab->ns->sym_root, vtab->name); st = gfc_find_symtree (vtab->ns->sym_root, vtab->name);
a->symtree = st; a->symtree = st;
a->ts = vtab->ts; a->ts = vtab->ts;
a->where = where;
} }
/* Replace the second argument with the corresponding vtab. */ /* 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) ...@@ -1060,8 +1064,11 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo)
gfc_add_vptr_component (mo); gfc_add_vptr_component (mo);
else if (mo->ts.type == BT_DERIVED) else if (mo->ts.type == BT_DERIVED)
{ {
locus where;
vtab = gfc_find_derived_vtab (mo->ts.u.derived); vtab = gfc_find_derived_vtab (mo->ts.u.derived);
/* Clear the old expr. */ /* Clear the old expr. */
where = mo->where;
gfc_free_ref_list (mo->ref); gfc_free_ref_list (mo->ref);
memset (mo, '\0', sizeof (gfc_expr)); memset (mo, '\0', sizeof (gfc_expr));
/* Construct a new one. */ /* Construct a new one. */
...@@ -1069,6 +1076,7 @@ gfc_resolve_extends_type_of (gfc_expr *f, gfc_expr *a, gfc_expr *mo) ...@@ -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); st = gfc_find_symtree (vtab->ns->sym_root, vtab->name);
mo->symtree = st; mo->symtree = st;
mo->ts = vtab->ts; mo->ts = vtab->ts;
mo->where = where;
} }
f->ts.type = BT_LOGICAL; f->ts.type = BT_LOGICAL;
......
...@@ -8863,6 +8863,7 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns) ...@@ -8863,6 +8863,7 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns)
st = gfc_find_symtree (vtab->ns->sym_root, vtab->name); 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 = 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 = gfc_get_variable_expr (st);
new_st->expr1->value.function.actual->next->expr->where = code->loc;
new_st->next = body->next; new_st->next = body->next;
} }
if (default_case->next) if (default_case->next)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment