ChangeLog: 2010-10-04 Ken Werner * value.h (value_non_lval): Declare. * value.c (value_non_lval): New function. * eval.c (evaluate_subexp_standard) : Call value_non_lval to ensure to return a non-lvalue. testsuite/ChangeLog: 2010-10-04 Ken Werner * gdb.base/exprs.exp: Add tests for pre-/post- in-/decrement operators. Index: gdb/eval.c =================================================================== RCS file: /cvs/src/src/gdb/eval.c,v retrieving revision 1.139 diff -p -u -r1.139 eval.c --- gdb/eval.c 11 Aug 2010 16:48:26 -0000 1.139 +++ gdb/eval.c 4 Oct 2010 18:11:09 -0000 @@ -2010,7 +2010,7 @@ evaluate_subexp_standard (struct type *e if (binop_user_defined_p (op, arg1, arg2)) return value_x_binop (arg1, arg2, op, OP_NULL, noside); else - return value_assign (arg1, arg2); + return value_non_lval (value_assign (arg1, arg2)); case BINOP_ASSIGN_MODIFY: (*pos) += 2; @@ -2043,7 +2043,7 @@ evaluate_subexp_standard (struct type *e arg2 = value_binop (tmp, arg2, op); } - return value_assign (arg1, arg2); + return value_non_lval (value_assign (arg1, arg2)); case BINOP_ADD: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); @@ -2702,7 +2702,7 @@ evaluate_subexp_standard (struct type *e arg2 = value_binop (tmp, arg2, BINOP_ADD); } - return value_assign (arg1, arg2); + return value_non_lval (value_assign (arg1, arg2)); } case UNOP_PREDECREMENT: @@ -2726,7 +2726,7 @@ evaluate_subexp_standard (struct type *e arg2 = value_binop (tmp, arg2, BINOP_SUB); } - return value_assign (arg1, arg2); + return value_non_lval (value_assign (arg1, arg2)); } case UNOP_POSTINCREMENT: @@ -2739,6 +2739,8 @@ evaluate_subexp_standard (struct type *e } else { + arg3 = value_non_lval (arg1); + if (ptrmath_type_p (exp->language_defn, value_type (arg1))) arg2 = value_ptradd (arg1, 1); else @@ -2751,7 +2753,7 @@ evaluate_subexp_standard (struct type *e } value_assign (arg1, arg2); - return arg1; + return arg3; } case UNOP_POSTDECREMENT: @@ -2764,6 +2766,8 @@ evaluate_subexp_standard (struct type *e } else { + arg3 = value_non_lval (arg1); + if (ptrmath_type_p (exp->language_defn, value_type (arg1))) arg2 = value_ptradd (arg1, -1); else @@ -2776,7 +2780,7 @@ evaluate_subexp_standard (struct type *e } value_assign (arg1, arg2); - return arg1; + return arg3; } case OP_THIS: Index: gdb/value.c =================================================================== RCS file: /cvs/src/src/gdb/value.c,v retrieving revision 1.113 diff -p -u -r1.113 value.c --- gdb/value.c 30 Sep 2010 18:58:07 -0000 1.113 +++ gdb/value.c 4 Oct 2010 18:11:09 -0000 @@ -826,6 +826,26 @@ value_copy (struct value *arg) return val; } +/* Return a version of ARG that is non-lvalue. */ + +struct value * +value_non_lval (struct value *arg) +{ + if (VALUE_LVAL (arg) != not_lval) + { + struct type *enc_type = value_enclosing_type (arg); + struct value *val = allocate_value (enc_type); + + memcpy (value_contents_all_raw (val), value_contents_all (arg), + TYPE_LENGTH (enc_type)); + val->type = arg->type; + set_value_embedded_offset (val, value_embedded_offset (arg)); + set_value_pointed_to_offset (val, value_pointed_to_offset (arg)); + return val; + } + return arg; +} + void set_value_component_location (struct value *component, const struct value *whole) Index: gdb/value.h =================================================================== RCS file: /cvs/src/src/gdb/value.h,v retrieving revision 1.161 diff -p -u -r1.161 value.h --- gdb/value.h 7 Jul 2010 16:15:18 -0000 1.161 +++ gdb/value.h 4 Oct 2010 18:11:09 -0000 @@ -710,6 +710,8 @@ extern void preserve_values (struct objf extern struct value *value_copy (struct value *); +extern struct value *value_non_lval (struct value *); + extern void preserve_one_value (struct value *, struct objfile *, htab_t); /* From valops.c */ Index: gdb/testsuite/gdb.base/exprs.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/exprs.exp,v retrieving revision 1.19 diff -p -u -r1.19 exprs.exp --- gdb/testsuite/gdb.base/exprs.exp 10 Jun 2010 19:48:19 -0000 1.19 +++ gdb/testsuite/gdb.base/exprs.exp 4 Oct 2010 18:11:09 -0000 @@ -253,3 +253,14 @@ gdb_test "set output-radix 8" ".*" test_expr "print red" "\\$\[0-9\]* = red" test_expr "print/d red" "\\$\[0-9\]* = 0" gdb_test "set output-radix 10" ".*" + +# Pre-/post in-/decrement tests. +gdb_test "set variable v_int = 1" "" +gdb_test "print v_int++" "\\$\[0-9\]* = 1" +gdb_test "print ++v_int" "\\$\[0-9\]* = 3" +gdb_test "print v_int--" "\\$\[0-9\]* = 3" +gdb_test "print --v_int" "\\$\[0-9\]* = 1" +gdb_test "print v_int++ = 5" "Left operand of assignment is not an lvalue." +gdb_test "print ++v_int = 5" "Left operand of assignment is not an lvalue." +gdb_test "print v_int-- = 5" "Left operand of assignment is not an lvalue." +gdb_test "print --v_int = 5" "Left operand of assignment is not an lvalue."