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

	(gfc_conv_expr_reference): ... here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182873 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 305646f..86de8bd 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -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

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 2ffa9fc..12d382d 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -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;
     }