gdb/

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

diff --git a/gdb/eval.c b/gdb/eval.c
index 09b41a0fbc2fe6a633d9a63cbaa7c77bdd6bed4b..af225c4670ae6339c34fab85315540eda39e3b6e 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1832,6 +1832,8 @@ evaluate_subexp_standard (struct type *expect_type,
              return value_zero (builtin_type (exp->gdbarch)->builtin_int,
                                 not_lval);
            }
+         else if (TYPE_GNU_IFUNC (ftype))
+           return allocate_value (TYPE_TARGET_TYPE (TYPE_TARGET_TYPE (ftype)));
          else if (TYPE_TARGET_TYPE (ftype))
            return allocate_value (TYPE_TARGET_TYPE (ftype));
          else
@@ -2196,7 +2198,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *v_one, *retval;
 
-             v_one = value_one (value_type (arg2), not_lval);
+             v_one = value_one (value_type (arg2));
              binop_promote (exp->language_defn, exp->gdbarch, &arg1, &v_one);
              retval = value_binop (arg1, v_one, op);
              return retval;
@@ -2740,7 +2742,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_ADD);
            }
@@ -2764,7 +2766,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_SUB);
            }
@@ -2790,7 +2792,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_ADD);
            }
@@ -2817,7 +2819,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_SUB);
            }
@@ -2828,11 +2830,7 @@ evaluate_subexp_standard (struct type *expect_type,
 
     case OP_THIS:
       (*pos) += 1;
-      return value_of_this (1);
-
-    case OP_OBJC_SELF:
-      (*pos) += 1;
-      return value_of_local ("self", 1);
+      return value_of_this (exp->language_defn);
 
     case OP_TYPE:
       /* The value is not supposed to be used.  This is here to make it