aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-const.c
diff options
context:
space:
mode:
authorMikael Morin <mikael@gcc.gnu.org>2011-11-03 22:10:25 +0000
committerMikael Morin <mikael@gcc.gnu.org>2011-11-03 22:10:25 +0000
commit99dd5a299012fdf2c236bef659d13323f00199e3 (patch)
treed8a32fbcba1fbace247eca6d8b5f47cd2780b1a0 /gcc/fortran/trans-const.c
parenta0add3be3e216ad8e7cbf02c684b70c13928500b (diff)
downloadgcc-99dd5a299012fdf2c236bef659d13323f00199e3.zip
gcc-99dd5a299012fdf2c236bef659d13323f00199e3.tar.gz
gcc-99dd5a299012fdf2c236bef659d13323f00199e3.tar.bz2
trans.h (struct gfc_ss, [...]): Move member struct gfc_ss::data::scalar into newly created union...
* trans.h (struct gfc_ss, struct gfc_ss_info): Move member struct gfc_ss::data::scalar into newly created union gfc_ss_info::data, and rename subfield expr to value. * trans-array.c (gfc_add_loop_ss_code, gfc_conv_array_index_offset, gfc_conv_expr_descriptor): Update reference chains. * trans-const.c (gfc_conv_constant): Ditto. * trans-expr.c (gfc_conv_expr): Ditto. From-SVN: r180870
Diffstat (limited to 'gcc/fortran/trans-const.c')
-rw-r--r--gcc/fortran/trans-const.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index 35a5e68..fa820ef 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -392,7 +392,7 @@ gfc_conv_constant (gfc_se * se, gfc_expr * expr)
gcc_assert (ss_info->type == GFC_SS_SCALAR);
gcc_assert (ss_info->expr == expr);
- se->expr = se->ss->data.scalar.expr;
+ se->expr = ss_info->data.scalar.value;
se->string_length = ss_info->string_length;
gfc_advance_se_ss_chain (se);
return;