From 686d4defdf4a343d4b700b8b544cd40c4f16b0d1 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 25 Oct 2013 11:37:13 +0100 Subject: Print nonexisting/optimized out static fields gracefully. With: struct static_struct { static int aaa; }; struct static_struct sss; int main () { return 0; } We get: (gdb) p sss $1 = {static aaa = } (gdb) p sss.aaa field aaa is nonexistent or has been optimized out Note that the "field aaa ..." message is an error being thrown. GDB is graceful everywhere else when printing optimized out values. IOW it usually prints an value and puts that in the value history. I see no reason for here to be different, more so that when the print the whole "containing" object (well, it's a static field, so it's not really a container), we already print . After the patch: (gdb) p sss $1 = {static aaa = } (gdb) p sss.aaa $2 = The value_entirely_optimized_out checks are there to preserve behavior. Without those, if the static field is a struct/union, GDB would go and print its fields one by one (and print for each). Tested on x86_64 Fedora 17. gdb/ 2013-10-25 Pedro Alves * cp-valprint.c (cp_print_value_fields): No longer handle a NULL static field value. (cp_print_static_field): If the value is entirely optimized out, print here. * jv-valprint.c (java_print_value_fields): No longer handle a NULL static field value. * p-valprint.c (pascal_object_print_static_field): If the value is entirely optimized out, print here. * valops.c (do_search_struct_field) (value_struct_elt_for_reference): No longer handle a NULL static field value. * value.c (value_static_field): Return an optimized out value instead of NULL. gdb/testsuite/ 2013-10-25 Pedro Alves * gdb.cp/m-static.exp: Adjust expected output of printing a nonexistent or optimized out static field. Also test printing the the "container" object. --- gdb/value.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gdb/value.c') diff --git a/gdb/value.c b/gdb/value.c index d96d285..1f562f5 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -2590,8 +2590,7 @@ unpack_pointer (struct type *type, const gdb_byte *valaddr) /* Get the value of the FIELDNO'th field (which must be static) of - TYPE. Return NULL if the field doesn't exist or has been - optimized out. */ + TYPE. */ struct value * value_static_field (struct type *type, int fieldno) @@ -2618,7 +2617,7 @@ value_static_field (struct type *type, int fieldno) NULL, NULL); if (!msym) - return NULL; + return allocate_optimized_out_value (type); else { retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno), -- cgit v1.1