Re: Revised pr 9067 patch

[Chris Moller <cmoller@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

On 02/03/10 17:21, Tom Tromey wrote:
>>>>>> "Chris" == Chris Moller<cmoller@redhat.com>  writes:
>>>>>>              
>
> Chris>  Fixes "Nested static causing infinite recursion in print."
>
> There are still the formatting nits that I mentioned on the last
> go-round.
>
> Chris>  +      void * statmem_obstack_top = NULL;
>
> No space after *.
>
> Chris>  +	  /* set the current printed-statics stack top */
>
> Comments in the GNU style are sentences.  They start with a capital
> letter and end with a period and two spaces.
>
> Chris>  +	  /* In effect, a pop of the printed-statics stack */
>
> Ditto.
>
> Chris>  +      first_dont_print = (CORE_ADDR *)obstack_base (&dont_print_statmem_obstack);
>
> Line goes past column 79?  It seems to but sometimes it is hard to tell
> in a patch.  Space after the closing paren of the cast.
>
> Chris>  +      i = obstack_object_size (&dont_print_statmem_obstack) / sizeof(CORE_ADDR);
>
> Space after sizeof.  Too many columns, should line break.
>
> Tom
>    


[-- Attachment #2: pr9067.patch --]
[-- Type: text/plain, Size: 6648 bytes --]

? 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	4 Feb 2010 14:11:22 -0000
@@ -1,3 +1,9 @@
+Tue Feb  2 16:44:56 2010  Chris Moller  <moller@mollerware.com>
+
+	PR gdb/9067
+	* cp-valprint.c (cp_print_value_fields) Fix use of obstacks.
+	(cp_print_static_field)  Fix use of obstacks.
+
 2010-02-02  Tom Tromey  <tromey@redhat.com>
 
 	* m2-typeprint.c (m2_record_fields): Don't use
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	4 Feb 2010 14:11:23 -0000
@@ -154,10 +154,13 @@
 		       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);
+  
+  if (recurse == 0
+      && obstack_object_size (&dont_print_statmem_obstack) > 0)
+    obstack_free (&dont_print_statmem_obstack, NULL);
 
   fprintf_filtered (stream, "{");
   len = TYPE_NFIELDS (type);
@@ -177,14 +180,13 @@
     fprintf_filtered (stream, "<No data fields>");
   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 +307,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)
@@ -515,8 +516,8 @@
 
       first_dont_print
 	= (CORE_ADDR *) obstack_base (&dont_print_statmem_obstack);
-      i = (CORE_ADDR *) obstack_next_free (&dont_print_statmem_obstack)
-	- first_dont_print;
+      i = obstack_object_size (&dont_print_statmem_obstack)
+	/ sizeof (CORE_ADDR);
 
       while (--i >= 0)
 	{
@@ -671,8 +672,6 @@
 			   show_objectprint,
 			   &setprintlist, &showprintlist);
 
+  obstack_begin (&dont_print_statmem_obstack, 32 * sizeof (CORE_ADDR));
   obstack_begin (&dont_print_vb_obstack, 32 * sizeof (struct type *));
-  obstack_specify_allocation (&dont_print_statmem_obstack,
-			      32 * sizeof (CORE_ADDR), sizeof (CORE_ADDR),
-			      xmalloc, xfree);
 }
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	4 Feb 2010 14:11:40 -0000
@@ -1,3 +1,10 @@
+2010-0-02  Chris Moller  <cmoller@redhat.com>
+
+       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  <tromey@redhat.com>
 
 	* 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	4 Feb 2010 14:11:41 -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	4 Feb 2010 14:11:41 -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	4 Feb 2010 14:11:41 -0000
@@ -0,0 +1,46 @@
+# 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 <http://www.gnu.org/licenses/>.
+
+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
+}
+
+gdb_test "print b"  ".*same as static member.*"
+
+
+gdb_exit
+return 0
+