summaryrefslogtreecommitdiff
path: root/gdb/cp-valprint.c
diff options
context:
space:
mode:
authorPatrick Frants <osscontribute@gmail.com>2017-10-26 22:26:08 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2017-10-26 22:26:08 -0400
commita43f3893f6cb66dfca7f628cd159a008009ad06f (patch)
treed41cec11fd0d299d17753559770aa1e5701f6d0c /gdb/cp-valprint.c
parent95904ac43c21694a609b4b8016b7fdfe8c2fc0fb (diff)
downloadbinutils-gdb-a43f3893f6cb66dfca7f628cd159a008009ad06f.tar.gz
Fix broken recursion detection when printing static members
Recursion detection for static members was broken. The implementation uses a growing (and shrinking) obstack object to simulate a stack of addresses (CORE_ADDR). Pushing addresses is implemented by calling obstack_grow(), while popping is implemented by calling obstack_free(). The latter is problematic because obstack_free() expects a pointer to the base of an object. When popping elements of the stack however, obstack_free() was called with the new top, which potentially is not the same as the base of the stack. This is unintended use and the effect is that obstack->next_free and obstack->object_base members are assigned the value of the new top, which equals an empty stack. Summary: popping elements would always result in an empty stack, which breaks the recursion detection. The fix shrinks the stack using obstack_blank_fast() with a negative value as described at the bottom of this page: https://gcc.gnu.org/onlinedocs/libiberty/Extra-Fast-Growing.html "You can use obstack_blank_fast with a “negative” size argument to make the current object smaller. Just don’t try to shrink it beyond zero length—there’s no telling what will happen if you do that. Earlier versions of obstacks allowed you to use obstack_blank to shrink objects. This will no longer work." The reproducer is added to gdb.cp/classes.exp, which fails without this patch. gdb/ChangeLog: * cp-valprint.c (cp_print_value_fields): Use obstack_blank_fast to rewind obstack. gdb/testsuite/ChangeLog: * gdb.cp/classes.exp (test_static_members): Test printing Outer::instance. * gdb.cp/classes.c (struct Inner, struct Outer): New. (Inner::instance, Outer::instance): New.
Diffstat (limited to 'gdb/cp-valprint.c')
-rw-r--r--gdb/cp-valprint.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index fb9bfd904f7..609dabb6606 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -371,13 +371,9 @@ cp_print_value_fields (struct type *type, struct type *real_type,
if (obstack_final_size > statmem_obstack_initial_size)
{
/* In effect, a pop of the printed-statics stack. */
-
- void *free_to_ptr =
- (char *) obstack_next_free (&dont_print_statmem_obstack) -
- (obstack_final_size - statmem_obstack_initial_size);
-
- obstack_free (&dont_print_statmem_obstack,
- free_to_ptr);
+ size_t shrink_bytes
+ = statmem_obstack_initial_size - obstack_final_size;
+ obstack_blank_fast (&dont_print_statmem_obstack, shrink_bytes);
}
if (last_set_recurse != recurse)