diff options
Diffstat (limited to 'gdb/eval.c')
| -rw-r--r-- | gdb/eval.c | 43 |
1 files changed, 39 insertions, 4 deletions
@@ -50,7 +50,8 @@ extern int overload_resolution; /* Prototypes for local functions. */ -static struct value *evaluate_subexp_for_sizeof (struct expression *, int *); +static struct value *evaluate_subexp_for_sizeof (struct expression *, int *, + enum noside); static struct value *evaluate_subexp_for_address (struct expression *, int *, enum noside); @@ -2562,7 +2563,7 @@ evaluate_subexp_standard (struct type *expect_type, evaluate_subexp (NULL_TYPE, exp, pos, EVAL_SKIP); goto nosideret; } - return evaluate_subexp_for_sizeof (exp, pos); + return evaluate_subexp_for_sizeof (exp, pos, noside); case UNOP_CAST: (*pos) += 2; @@ -2996,10 +2997,13 @@ evaluate_subexp_with_coercion (struct expression *exp, /* Evaluate a subexpression of EXP, at index *POS, and return a value for the size of that subexpression. - Advance *POS over the subexpression. */ + Advance *POS over the subexpression. If NOSIDE is EVAL_NORMAL + we allow side-effects on the operand if its type is a variable + length array. */ static struct value * -evaluate_subexp_for_sizeof (struct expression *exp, int *pos) +evaluate_subexp_for_sizeof (struct expression *exp, int *pos, + enum noside noside) { /* FIXME: This should be size_t. */ struct type *size_type = builtin_type (exp->gdbarch)->builtin_int; @@ -3052,6 +3056,37 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos) (*pos) += 4; break; + /* Deal with the special case if NOSIDE is EVAL_NORMAL and the resulting + type of the subscript is a variable length array type. In this case we + must re-evaluate the right hand side of the subcription to allow + side-effects. */ + case BINOP_SUBSCRIPT: + if (noside == EVAL_NORMAL) + { + int pc = (*pos) + 1; + + val = evaluate_subexp (NULL_TYPE, exp, &pc, EVAL_AVOID_SIDE_EFFECTS); + type = check_typedef (value_type (val)); + if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + { + type = check_typedef (TYPE_TARGET_TYPE (type)); + if (TYPE_CODE (type) == TYPE_CODE_ARRAY) + { + type = TYPE_INDEX_TYPE (type); + /* Only re-evaluate the right hand side if the resulting type + is a variable length type. */ + if (TYPE_RANGE_DATA (type)->flag_bound_evaluated) + { + val = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_NORMAL); + return value_from_longest + (size_type, (LONGEST) TYPE_LENGTH (value_type (val))); + } + } + } + } + + /* Fall through. */ + default: val = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS); type = value_type (val); |