PR c++/11990:

[deliverable/binutils-gdb.git] / gdb / eval.c

diff --git a/gdb/eval.c b/gdb/eval.c
index f4b39cbc2b05f9686898f6a1a564a2a368df7682..a91ba2271abd589541a6d5910ff4dfe73ace7d86 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -76,7 +76,7 @@ evaluate_subexp (struct type *expect_type, struct expression *exp,
    and return the result as a number.  */
 
 CORE_ADDR
-parse_and_eval_address (char *exp)
+parse_and_eval_address (const char *exp)
 {
   struct expression *expr = parse_expression (exp);
   CORE_ADDR addr;
@@ -104,7 +104,7 @@ parse_and_eval_long (char *exp)
 }
 
 struct value *
-parse_and_eval (char *exp)
+parse_and_eval (const char *exp)
 {
   struct expression *expr = parse_expression (exp);
   struct value *val;
@@ -121,7 +121,7 @@ parse_and_eval (char *exp)
    EXPP is advanced to point to the comma.  */
 
 struct value *
-parse_to_comma_and_eval (char **expp)
+parse_to_comma_and_eval (const char **expp)
 {
   struct expression *expr = parse_exp_1 (expp, 0, (struct block *) 0, 1);
   struct value *val;
@@ -792,7 +792,7 @@ evaluate_subexp_standard (struct type *expect_type,
        if (noside == EVAL_AVOID_SIDE_EFFECTS)
          return value_zero (SYMBOL_TYPE (sym), not_lval);
 
-       if (SYMBOL_CLASS (sym) != LOC_COMPUTED
+       if (SYMBOL_COMPUTED_OPS (sym) == NULL
            || SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry == NULL)
          error (_("Symbol \"%s\" does not have any specific entry value"),
                 SYMBOL_PRINT_NAME (sym));
@@ -1847,18 +1847,9 @@ evaluate_subexp_standard (struct type *expect_type,
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
        goto nosideret;
-      if (noside == EVAL_AVOID_SIDE_EFFECTS)
-       return value_zero (lookup_struct_elt_type (value_type (arg1),
-                                                  &exp->elts[pc + 2].string,
-                                                  0),
-                          lval_memory);
-      else
-       {
-         struct value *temp = arg1;
-
-         return value_struct_elt (&temp, NULL, &exp->elts[pc + 2].string,
-                                  NULL, "structure");
-       }
+      /* Also handle EVAL_AVOID_SIDE_EFFECTS.  */
+      return value_struct_elt (&arg1, NULL, &exp->elts[pc + 2].string,
+                              NULL, "structure");
 
     case STRUCTOP_PTR:
       tem = longest_to_int (exp->elts[pc + 1].longconst);
@@ -1908,18 +1899,9 @@ evaluate_subexp_standard (struct type *expect_type,
           }
       }
 
-      if (noside == EVAL_AVOID_SIDE_EFFECTS)
-       return value_zero (lookup_struct_elt_type (value_type (arg1),
-                                                  &exp->elts[pc + 2].string,
-                                                  0),
-                          lval_memory);
-      else
-       {
-         struct value *temp = arg1;
-
-         return value_struct_elt (&temp, NULL, &exp->elts[pc + 2].string,
-                                  NULL, "structure pointer");
-       }
+      /* Also handle EVAL_AVOID_SIDE_EFFECTS.  */
+      return value_struct_elt (&arg1, NULL, &exp->elts[pc + 2].string,
+                              NULL, "structure pointer");
 
     case STRUCTOP_MEMBER:
     case STRUCTOP_MPTR:
@@ -2929,12 +2911,12 @@ evaluate_subexp_for_address (struct expression *exp, int *pos,
        {
          struct type *type = check_typedef (value_type (x));
 
-         if (VALUE_LVAL (x) == lval_memory || value_must_coerce_to_target (x))
-           return value_zero (lookup_pointer_type (value_type (x)),
-                              not_lval);
-         else if (TYPE_CODE (type) == TYPE_CODE_REF)
+         if (TYPE_CODE (type) == TYPE_CODE_REF)
            return value_zero (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
                               not_lval);
+         else if (VALUE_LVAL (x) == lval_memory || value_must_coerce_to_target (x))
+           return value_zero (lookup_pointer_type (value_type (x)),
+                              not_lval);
          else
            error (_("Attempt to take address of "
                     "value not located in memory."));