From 582d1c226460f8e764789dba912c35fb0361403c Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Mon, 10 Dec 2001 23:05:00 +0000 Subject: Approved by Jim Blandy: 2001-12-10 Fred Fish * values.c (value_fn_field): Add physname variable. Use a minimal symbol if we don't find a full symbol. Remove setting of the new value's type since that was already done by allocate_value(). Remove obsolete commented out error call since callees need to handle a NULL return, which is possible result not an error. * eval.c (evaluate_subexp_standard): Move check for inlined functions to precede attempt to dereference a NULL argvec[0]. --- gdb/eval.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/eval.c') diff --git a/gdb/eval.c b/gdb/eval.c index c15b236568c..8a41d30c9cf 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -917,6 +917,8 @@ evaluate_subexp_standard (struct type *expect_type, if (noside == EVAL_SKIP) goto nosideret; + if (argvec[0] == NULL) + error ("Cannot evaluate function -- may be inlined"); if (noside == EVAL_AVOID_SIDE_EFFECTS) { /* If the return type doesn't look like a function type, call an @@ -934,8 +936,6 @@ evaluate_subexp_standard (struct type *expect_type, else error ("Expression of type other than \"Function returning ...\" used as function"); } - if (argvec[0] == NULL) - error ("Cannot evaluate function -- may be inlined"); return call_function_by_hand (argvec[0], nargs, argvec + 1); /* pai: FIXME save value from call_function_by_hand, then adjust pc by adjust_fn_pc if +ve */ -- cgit v1.2.1