gfortran.h (gfc_expr): Remove from_H, add "representation" struct.

* gfortran.h (gfc_expr): Remove from_H, add "representation"
struct.
* primary.c (match_hollerith_constant): Store the representation
of the Hollerith in representation, not in value.character.
* arith.c: Add dependency on target-memory.h.
(eval_intrinsic): Remove check for from_H.
(hollerith2representation): New function.
(gfc_hollerith2int): Determine value of the new constant.
(gfc_hollerith2real): Likewise.
(gfc_hollerith2complex): Likewise.
(gfc_hollerith2logical): Likewise.
(gfc_hollerith2character): Point both representation.string and
value.character.string at the value string.
* data.c (create_character_initializer): For BT_HOLLERITH
rvalues, get the value from the representation rather than
value.character.
* expr.c (free_expr0): Update handling of BT_HOLLERITH values
and values with representation.string.
(gfc_copy_expr): Likewise.
* intrinsic.c (do_simplify): Remove special treatement of
variables resulting from Hollerith constants.
* dump-parse-trees.c (gfc_show_expr): Update handling of
Holleriths.
* trans-const.c (gfc_conv_constant_to_tree): Replace from_H
check with check for representation.string; get Hollerith
representation from representation.string, not value.character.
* trans-expr.c (is_zero_initializer_p): Replace from_H check
with check for representation.string.
* trans-stmt.c (gfc_trans_integer_select): Use
gfc_conv_mpz_to_tree for case values, so as to avoid picking up
the memory representation if the case is given by a transfer
expression.
* target-memory.c (gfc_target_encode_expr): Use the known memory
representation rather than the value, if it exists.
(gfc_target_interpret_expr): Store the memory representation of
the interpreted expression as well as its value.
(interpret_integer): Move to gfc_interpret_integer, make
non-static.
(interpret_float): Move to gfc_interpret_float, make non-static.
(interpret_complex): Move to gfc_interpret_complex, make
non-static.
(interpret_logical): Move to gfc_interpret_logical, make
non-static.
(interpret_character): Move to gfc_interpret_character, make
non-static.
(interpret_derived): Move to gfc_interpret_derived, make
non-static.
* target-memory.h: Add prototypes for newly-exported
gfc_interpret_* functions.

From-SVN: r125135

1 files changed, 22 insertions, 16 deletions

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 9957a46..849b406 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -140,12 +140,7 @@ free_expr0 (gfc_expr *e)
   switch (e->expr_type)
     {
     case EXPR_CONSTANT:
-      if (e->from_H)
-	{
-	  gfc_free (e->value.character.string);
-	  break;
-	}
-
+      /* Free any parts of the value that need freeing.  */
       switch (e->ts.type)
 	{
 	case BT_INTEGER:
@@ -157,7 +152,6 @@ free_expr0 (gfc_expr *e)
 	  break;
 
 	case BT_CHARACTER:
-	case BT_HOLLERITH:
 	  gfc_free (e->value.character.string);
 	  break;
 
@@ -170,6 +164,11 @@ free_expr0 (gfc_expr *e)
 	  break;
 	}
 
+      /* Free the representation, except in character constants where it
+	 is the same as value.character.string and thus already freed.  */
+      if (e->representation.string && e->ts.type != BT_CHARACTER)
+	gfc_free (e->representation.string);
+
       break;
 
     case EXPR_OP:
@@ -413,14 +412,16 @@ gfc_copy_expr (gfc_expr *p)
       break;
 
     case EXPR_CONSTANT:
-      if (p->from_H)
+      /* Copy target representation, if it exists.  */
+      if (p->representation.string)
 	{
-	  s = gfc_getmem (p->value.character.length + 1);
-	  q->value.character.string = s;
+	  s = gfc_getmem (p->representation.length + 1);
+	  q->representation.string = s;
 
-	  memcpy (s, p->value.character.string, p->value.character.length + 1);
-	  break;
+	  memcpy (s, p->representation.string, p->representation.length + 1);
 	}
+
+      /* Copy the values of any pointer components of p->value.  */
       switch (q->ts.type)
 	{
 	case BT_INTEGER:
@@ -442,13 +443,18 @@ gfc_copy_expr (gfc_expr *p)
 	  break;
 
 	case BT_CHARACTER:
-	case BT_HOLLERITH:
-	  s = gfc_getmem (p->value.character.length + 1);
-	  q->value.character.string = s;
+	  if (p->representation.string)
+	    q->value.character.string = q->representation.string;
+	  else
+	    {
+	      s = gfc_getmem (p->value.character.length + 1);
+	      q->value.character.string = s;
 
-	  memcpy (s, p->value.character.string, p->value.character.length + 1);
+	      memcpy (s, p->value.character.string, p->value.character.length + 1);
+	    }
 	  break;
 
+	case BT_HOLLERITH:
 	case BT_LOGICAL:
 	case BT_DERIVED:
 	  break;		/* Already done */