From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19772 invoked by alias); 2 Feb 2010 21:57:48 -0000 Received: (qmail 19759 invoked by uid 22791); 2 Feb 2010 21:57:46 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,HK_OBFDOM,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 02 Feb 2010 21:57:41 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o12Lvd92021528 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 2 Feb 2010 16:57:39 -0500 Received: from qcore.mollernet.net (vpn-8-240.rdu.redhat.com [10.11.8.240]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o12LvcNs019679 for ; Tue, 2 Feb 2010 16:57:39 -0500 Message-ID: <4B689FD2.9070300@redhat.com> Date: Tue, 02 Feb 2010 21:57:00 -0000 From: Chris Moller User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2 MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: Patch for PR 10728 Content-Type: multipart/mixed; boundary="------------030602000407090309030701" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-02/txt/msg00047.txt.bz2 This is a multi-part message in MIME format. --------------030602000407090309030701 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 238 The bug was basically in the mis-use of obstacks in cp-valprint.c The patch includes testcase source files and and an expects file. The gdb.sum diff between the unpatched and patched make check is also attached. Chris Moller, Red Hat --------------030602000407090309030701 Content-Type: text/plain; name="pr9067.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pr9067.patch" Content-length: 8230 ? gdb/testsuite/gdb.cp/pr9067 Index: gdb/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/ChangeLog,v retrieving revision 1.11315 diff -u -r1.11315 ChangeLog --- gdb/ChangeLog 2 Feb 2010 16:47:13 -0000 1.11315 +++ gdb/ChangeLog 2 Feb 2010 21:53:37 -0000 @@ -1,3 +1,14 @@ +Tue Feb 2 16:44:56 2010 Chris Moller + + PR gdb/9067 + * c-lang.h: + * c-valprint.c (c_value_print): Added initialisation and cleanup + for static member obstack. + * cp-valprint.c (p_initialise_statmem_stack) New. + (cp_free_statmem_stack) New. + (cp_print_value_fields) Fix use of obstacks. + (cp_print_static_field) Fix use of obstacks. + 2010-02-02 Tom Tromey * m2-typeprint.c (m2_record_fields): Don't use Index: gdb/c-lang.h =================================================================== RCS file: /cvs/src/src/gdb/c-lang.h,v retrieving revision 1.27 diff -u -r1.27 c-lang.h --- gdb/c-lang.h 2 Feb 2010 16:45:16 -0000 1.27 +++ gdb/c-lang.h 2 Feb 2010 21:53:37 -0000 @@ -112,6 +112,9 @@ extern int cp_is_vtbl_member (struct type *); +extern void cp_initialise_statmem_stack(); +extern void cp_free_statmem_stack(); + /* These are in c-valprint.c. */ extern int c_textual_element_type (struct type *, char); Index: gdb/c-valprint.c =================================================================== RCS file: /cvs/src/src/gdb/c-valprint.c,v retrieving revision 1.67 diff -u -r1.67 c-valprint.c --- gdb/c-valprint.c 2 Feb 2010 16:45:16 -0000 1.67 +++ gdb/c-valprint.c 2 Feb 2010 21:53:37 -0000 @@ -710,8 +710,17 @@ /* Otherwise, we end up at the return outside this "if" */ } - return val_print (val_type, value_contents_all (val), + { + int rc; + + cp_initialise_statmem_stack(); + + rc = val_print (val_type, value_contents_all (val), value_embedded_offset (val), value_address (val), stream, 0, &opts, current_language); + + cp_free_statmem_stack(); + return rc; + } } Index: gdb/cp-valprint.c =================================================================== RCS file: /cvs/src/src/gdb/cp-valprint.c,v retrieving revision 1.63 diff -u -r1.63 cp-valprint.c --- gdb/cp-valprint.c 2 Feb 2010 16:45:16 -0000 1.63 +++ gdb/cp-valprint.c 2 Feb 2010 21:53:38 -0000 @@ -134,6 +134,22 @@ return 0; } +/* initialise to empty the static member stack */ +void +cp_initialise_statmem_stack() +{ + obstack_init (&dont_print_statmem_obstack); +} + +/* initialise to free the static member stack */ +void +cp_free_statmem_stack() +{ + if (obstack_object_size (&dont_print_statmem_obstack) > 0) + obstack_free (&dont_print_statmem_obstack, NULL); +} + + /* Mutually recursive subroutines of cp_print_value and c_val_print to print out a structure's fields: cp_print_value_fields and cp_print_value. @@ -154,7 +170,6 @@ struct type **dont_print_vb, int dont_print_statmem) { int i, len, n_baseclasses; - char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack); int fields_seen = 0; CHECK_TYPEDEF (type); @@ -177,14 +192,13 @@ fprintf_filtered (stream, ""); else { - struct obstack tmp_obstack = dont_print_statmem_obstack; - + void * statmem_obstack_top = NULL; + if (dont_print_statmem == 0) { - /* If we're at top level, carve out a completely fresh - chunk of the obstack and use that until this particular - invocation returns. */ - obstack_finish (&dont_print_statmem_obstack); + /* set the current printed-statics stack top */ + statmem_obstack_top + = obstack_next_free (&dont_print_statmem_obstack); } for (i = n_baseclasses; i < len; i++) @@ -305,10 +319,9 @@ if (dont_print_statmem == 0) { - /* Free the space used to deal with the printing - of the members from top level. */ - obstack_free (&dont_print_statmem_obstack, last_dont_print); - dont_print_statmem_obstack = tmp_obstack; + /* In effect, a pop of the printed-statics stack */ + if (obstack_object_size (&dont_print_statmem_obstack) > 0) + obstack_free (&dont_print_statmem_obstack, statmem_obstack_top); } if (options->pretty) @@ -513,10 +526,10 @@ CORE_ADDR addr; int i; - first_dont_print - = (CORE_ADDR *) obstack_base (&dont_print_statmem_obstack); - i = (CORE_ADDR *) obstack_next_free (&dont_print_statmem_obstack) - - first_dont_print; + first_dont_print = + (CORE_ADDR *)obstack_base (&dont_print_statmem_obstack); + i = + obstack_object_size (&dont_print_statmem_obstack) / sizeof(CORE_ADDR); while (--i >= 0) { Index: gdb/testsuite/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v retrieving revision 1.2119 diff -u -r1.2119 ChangeLog --- gdb/testsuite/ChangeLog 2 Feb 2010 16:47:14 -0000 1.2119 +++ gdb/testsuite/ChangeLog 2 Feb 2010 21:53:55 -0000 @@ -1,3 +1,10 @@ +2010-0-02 Chris Moller + + PR gdb/9067 + * gdb.cp/pr9067.exp: New + * gdb.cp/pr9067.cc: New + * gdb.cp/Makefile.in (EXECUTABLES): Add pr9067 + 2010-02-02 Tom Tromey * gdb.dwarf2/member-ptr-forwardref.exp: Update expected result for Index: gdb/testsuite/gdb.cp/Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/Makefile.in,v retrieving revision 1.7 diff -u -r1.7 Makefile.in --- gdb/testsuite/gdb.cp/Makefile.in 10 Dec 2009 20:57:10 -0000 1.7 +++ gdb/testsuite/gdb.cp/Makefile.in 2 Feb 2010 21:53:56 -0000 @@ -4,7 +4,7 @@ EXECUTABLES = ambiguous annota2 anon-union cplusfuncs cttiadd \ derivation inherit local member-ptr method misc \ overload ovldbreak ref-typ ref-typ2 templates userdef virtfunc namespace \ - ref-types ref-params method2 pr9594 gdb2495 virtfunc2 + ref-types ref-params method2 pr9594 gdb2495 virtfunc2 pr9067 all info install-info dvi install uninstall installcheck check: @echo "Nothing to be done for $@..." Index: gdb/testsuite/gdb.cp/pr9067.cc =================================================================== RCS file: gdb/testsuite/gdb.cp/pr9067.cc diff -N gdb/testsuite/gdb.cp/pr9067.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gdb/testsuite/gdb.cp/pr9067.cc 2 Feb 2010 21:53:56 -0000 @@ -0,0 +1,17 @@ +struct B; + +struct A { + static B b; +}; + +struct B { + A a; +}; + +B A::b; +B b; + +int main(int,char **) +{ + return 0; +} Index: gdb/testsuite/gdb.cp/pr9067.exp =================================================================== RCS file: gdb/testsuite/gdb.cp/pr9067.exp diff -N gdb/testsuite/gdb.cp/pr9067.exp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gdb/testsuite/gdb.cp/pr9067.exp 2 Feb 2010 21:53:56 -0000 @@ -0,0 +1,53 @@ +# Copyright 2009, 2010 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set nl "\[\r\n\]+" + +if { [skip_cplus_tests] } { continue } + +load_lib "cp-support.exp" + +set testfile "pr9067" +set srcfile ${testfile}.cc +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {c++ debug}] != "" } { + untested pr9067.exp + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if ![runto_main] then { + perror "couldn't run to breakpoint" + continue +} + +send_gdb "print b\n" + +gdb_expect { + -re "same as static member" { + pass "print b" + } + timeout { fail "(timeout) print b" } +} + + +gdb_exit +return 0 + --------------030602000407090309030701 Content-Type: text/plain; name="pr9067-summary.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pr9067-summary.diff" Content-length: 1306 --- gdb-virgin.sum 2010-02-02 16:07:43.278040349 -0500 +++ gdb-patched.sum 2010-02-02 16:41:59.925040099 -0500 @@ -1,4 +1,4 @@ -Test Run By moller on Tue Feb 2 15:58:30 2010 +Test Run By moller on Tue Feb 2 16:32:45 2010 Native configuration is i686-pc-linux-gnu === gdb tests === @@ -11501,6 +11501,8 @@ Running ../../../src/gdb/testsuite/gdb.cp/pr-574.exp ... PASS: gdb.cp/pr-574.exp: continue to breakpoint: end of constructors PASS: gdb.cp/pr-574.exp: PR gdb/574 +Running ../../../src/gdb/testsuite/gdb.cp/pr9067.exp ... +PASS: gdb.cp/pr9067.exp: print b Running ../../../src/gdb/testsuite/gdb.cp/pr9631.exp ... PASS: gdb.cp/pr9631.exp: continue to breakpoint: after bar tender is initialized PASS: gdb.cp/pr9631.exp: print tender @@ -15509,7 +15511,7 @@ PASS: gdb.threads/watchthreads2.exp: all threads started PASS: gdb.threads/watchthreads2.exp: watch x PASS: gdb.threads/watchthreads2.exp: set var test_ready = 1 -PASS: gdb.threads/watchthreads2.exp: all threads incremented x +KFAIL: gdb.threads/watchthreads2.exp: gdb can drop watchpoints in multithreaded app (PRMS: gdb/10116) Running ../../../src/gdb/testsuite/gdb.trace/actions.exp ... PASS: gdb.trace/actions.exp: 5.1a: set three tracepoints, no actions PASS: gdb.trace/actions.exp: 5.1b: set actions for first tracepoint --------------030602000407090309030701--