trans-expr.c (gfc_conv_expr): Move address taking...

* trans-expr.c (gfc_conv_expr): Move address taking...
	(gfc_conv_expr_reference): ... here.

From-SVN: r182873
This commit is contained in:
Mikael Morin 2012-01-04 13:43:35 +00:00
parent f5a3d840b6
commit 591823cc9a
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2012-01-04 Mikael Morin <mikael@gcc.gnu.org>
* trans-expr.c (gfc_conv_expr): Move address taking...
(gfc_conv_expr_reference): ... here.
2012-01-04 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/49693

View file

@ -5331,8 +5331,6 @@ gfc_conv_expr (gfc_se * se, gfc_expr * expr)
/* Substitute a scalar expression evaluated outside the scalarization
loop. */
se->expr = ss_info->data.scalar.value;
if (ss_info->type == GFC_SS_REFERENCE)
se->expr = gfc_build_addr_expr (NULL_TREE, se->expr);
se->string_length = ss_info->string_length;
gfc_advance_se_ss_chain (se);
return;
@ -5465,6 +5463,7 @@ gfc_conv_expr_reference (gfc_se * se, gfc_expr * expr)
/* Returns a reference to the scalar evaluated outside the loop
for this case. */
gfc_conv_expr (se, expr);
se->expr = gfc_build_addr_expr (NULL_TREE, se->expr);
return;
}