Re: [PATCH] Only print entry values for arguments.

Yao Qi
2013-08-14T09:46:29Z

On 08/08/2013 10:23 PM, Pedro Alves wrote:
> If we run 7.6 against that test pristine would it pass cleanly?
>

No. In gdb.trace/mi-trace-unavailable.exp, we'll save trace data to
ctf and test "--skip-unavailable" for MI command
"-data-list-register-values". These two are not supported in 7.6 tree,
so we'll get three fails:

FAIL: gdb.trace/mi-trace-unavailable.exp: save ctf trace file
FAIL: gdb.trace/mi-trace-unavailable.exp: live: -data-list-register-values --skip-unavailable x
FAIL: gdb.trace/mi-trace-unavailable.exp: tfile: -data-list-register-values --skip-unavailable x

>> >I plan to
>> > 1) cvs -d :ext:qiyao@sourceware.org:/cvs/src co -r gdb_7_6-branch gdb
>> > 2) apply this patch without changes to gdb.trace/mi-trace-unavailable.exp
>> >
>> >Since it is not a bug fix, don't have to mention it in
>> >http://sourceware.org/gdb/wiki/GDB_7.6_Release .
> Hmm. If this is issue is present in the 7.6 branch, how is it
> not a bug fix? Instead, what we should do if the bug wasn't
> reported in bugzilla, is file one, so we can reference it from
> the wiki.
>

I filed PR gdb/15837 (http://sourceware.org/bugzilla/show_bug.cgi?id=15837)
and record it in wiki like this:

PR gdb/15837 (GDB prints entry values for local variables)

Here is the patch to 7.6 branch.

--
Yao (é½å°§)

gdb:

2013-08-14 Yao Qi <yao@codesourcery.com>

PR gdb/15837:
* frame.h (read_frame_local): Declare.
* mi/mi-cmd-stack.c (list_args_or_locals): Call
read_frame_local.
* stack.c (read_frame_local): New.

---
gdb/frame.h | 2 ++
gdb/mi/mi-cmd-stack.c | 5 ++++-
gdb/stack.c | 21 +++++++++++++++++++++

diff --git a/gdb/frame.h b/gdb/frame.h
index 31b9cb7..f02addf 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -714,6 +714,8 @@ struct frame_arg
extern void read_frame_arg (struct symbol *sym, struct frame_info *frame,
struct frame_arg *argp,
struct frame_arg *entryargp);
+extern void read_frame_local (struct symbol *sym, struct frame_info *frame,
+ struct frame_arg *argp);

extern void args_info (char *, int);

diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 9294e46..e542fc1 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -602,7 +602,10 @@ list_args_or_locals (enum what_to_list what, enum print_values values,
&& TYPE_CODE (type) != TYPE_CODE_UNION)
{
case PRINT_ALL_VALUES:
- read_frame_arg (sym2, fi, &arg, &entryarg);
+ if (SYMBOL_IS_ARGUMENT (sym))
+ read_frame_arg (sym2, fi, &arg, &entryarg);
+ else
+ read_frame_local (sym2, fi, &arg);
}
break;
}
diff --git a/gdb/stack.c b/gdb/stack.c
index d89ff89..7d97dc8 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -301,6 +301,27 @@ print_frame_arg (const struct frame_arg *arg)
annotate_arg_end ();
}

+/* Read in inferior function local SYM at FRAME into ARGP. Caller is
+ responsible for xfree of ARGP->ERROR. This function never throws an
+ exception. */
+
+void
+read_frame_local (struct symbol *sym, struct frame_info *frame,
+ struct frame_arg *argp)
+{
+ volatile struct gdb_exception except;
+ struct value *val = NULL;
+
+ TRY_CATCH (except, RETURN_MASK_ERROR)
+ {
+ val = read_var_value (sym, frame);
+ }
+
+ argp->error = (val == NULL) ? xstrdup (except.message) : NULL;
+ argp->sym = sym;
+ argp->val = val;
+}
+
/* Read in inferior function parameter SYM at FRAME into ARGP. Caller is
responsible for xfree of ARGP->ERROR. This function never throws an
exception. */