diff options
Diffstat (limited to 'gdb/ch-lang.c')
| -rw-r--r-- | gdb/ch-lang.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gdb/ch-lang.c b/gdb/ch-lang.c index 904dc6b..5c041d7 100644 --- a/gdb/ch-lang.c +++ b/gdb/ch-lang.c @@ -423,6 +423,10 @@ evaluate_subexp_chill (expect_type, exp, pos, noside) switch (TYPE_CODE (type)) { case TYPE_CODE_PTR: + type = check_typedef (TYPE_TARGET_TYPE (type)); + if (!type || TYPE_CODE (type) || TYPE_CODE_FUNC) + error ("reference value used as function"); + /* ... fall through ... */ case TYPE_CODE_FUNC: /* It's a function call. */ if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -433,16 +437,11 @@ evaluate_subexp_chill (expect_type, exp, pos, noside) argvec = (value_ptr *) alloca (sizeof (value_ptr) * (nargs + 2)); argvec[0] = arg1; tem = 1; - if (type && TYPE_CODE (type) == TYPE_CODE_PTR) - type = check_typedef (TYPE_TARGET_TYPE (type)); - if (type && TYPE_CODE (type) == TYPE_CODE_FUNC) + for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++) { - for (; tem <= nargs && tem <= TYPE_NFIELDS (type); tem++) - { - argvec[tem] - = evaluate_subexp_chill (TYPE_FIELD_TYPE (type, tem-1), - exp, pos, noside); - } + argvec[tem] + = evaluate_subexp_chill (TYPE_FIELD_TYPE (type, tem-1), + exp, pos, noside); } for (; tem <= nargs; tem++) argvec[tem] = evaluate_subexp_with_coercion (exp, pos, noside); |