Remove commented-out code in jv-lang.c

[binutils-gdb.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index d3d94d9cd8294873b23cedae4ef87f27b10e1acf..3fbb1f1f3c85f7db28f205d0cea41b1a91a4a5cf 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -186,19 +186,19 @@ cp_print_value_fields (struct type *type, struct type *real_type,
     fprintf_filtered (stream, "<No data fields>");
   else
     {
-      void *statmem_obstack_top = NULL;
-      void *stat_array_obstack_top = NULL;
+      int statmem_obstack_initial_size = 0;
+      int stat_array_obstack_initial_size = 0;
       
       if (dont_print_statmem == 0)
        {
-         /* Set the current printed-statics stack top.  */
-         statmem_obstack_top
-           = obstack_next_free (&dont_print_statmem_obstack);
+         statmem_obstack_initial_size =
+           obstack_object_size (&dont_print_statmem_obstack);
 
          if (last_set_recurse != recurse)
            {
-             stat_array_obstack_top
-               = obstack_next_free (&dont_print_stat_array_obstack);
+             stat_array_obstack_initial_size =
+               obstack_object_size (&dont_print_stat_array_obstack);
+
              last_set_recurse = recurse;
            }
        }
@@ -281,6 +281,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
              else
                {
                  struct value_print_options opts = *options;
+
                  opts.deref_ref = 0;
                  v = value_from_longest
                    (TYPE_FIELD_TYPE (type, i), 
@@ -299,6 +300,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
              else if (field_is_static (&TYPE_FIELD (type, i)))
                {
                  struct value *v = value_static_field (type, i);
+
                  if (v == NULL)
                    fputs_filtered ("<optimized out>", stream);
                  else
@@ -308,6 +310,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
              else
                {
                  struct value_print_options opts = *options;
+
                  opts.deref_ref = 0;
                  val_print (TYPE_FIELD_TYPE (type, i),
                             valaddr, offset + TYPE_FIELD_BITPOS (type, i) / 8,
@@ -321,14 +324,34 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 
       if (dont_print_statmem == 0)
        {
-         if (obstack_object_size (&dont_print_statmem_obstack) > 0) 
-           obstack_free (&dont_print_statmem_obstack, statmem_obstack_top);
+         int obstack_final_size =
+           obstack_object_size (&dont_print_statmem_obstack);
+
+         if (obstack_final_size > statmem_obstack_initial_size) {
+           /* In effect, a pop of the printed-statics stack.  */
+
+           void *free_to_ptr =
+             obstack_next_free (&dont_print_statmem_obstack) -
+             (obstack_final_size - statmem_obstack_initial_size);
+
+           obstack_free (&dont_print_statmem_obstack,
+                         free_to_ptr);
+         }
 
          if (last_set_recurse != recurse)
            {
-             if (obstack_object_size (&dont_print_stat_array_obstack) > 0) 
-               obstack_free (&dont_print_stat_array_obstack,
-                             stat_array_obstack_top);
+             int obstack_final_size =
+               obstack_object_size (&dont_print_stat_array_obstack);
+             
+             if (obstack_final_size > stat_array_obstack_initial_size)
+               {
+                 void *free_to_ptr =
+                   obstack_next_free (&dont_print_stat_array_obstack) -
+                   (obstack_final_size - stat_array_obstack_initial_size);
+
+                 obstack_free (&dont_print_stat_array_obstack,
+                               free_to_ptr);
+               }
              last_set_recurse = -1;
            }
        }
@@ -355,7 +378,8 @@ cp_print_value_fields_rtti (struct type *type,
                            CORE_ADDR address,
                            struct ui_file *stream, int recurse,
                            const struct value_print_options *options,
-                           struct type **dont_print_vb, int dont_print_statmem)
+                           struct type **dont_print_vb, 
+                           int dont_print_statmem)
 {
   struct value *value;
   int full, top, using_enc;
@@ -443,6 +467,7 @@ cp_print_value (struct type *type, struct type *real_type,
            {
              /* FIXME (alloca): unsafe if baseclass is really really large. */
              gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
+
              base_valaddr = buf;
              if (target_read_memory (address + boffset, buf,
                                      TYPE_LENGTH (baseclass)) != 0)
@@ -555,7 +580,6 @@ cp_print_static_field (struct type *type,
       addr = value_address (val);
       obstack_grow (&dont_print_statmem_obstack, (char *) &addr,
                    sizeof (CORE_ADDR));
-
       CHECK_TYPEDEF (type);
       cp_print_value_fields (type, value_enclosing_type (val),
                             value_contents_all (val),
@@ -679,6 +703,7 @@ cp_print_class_member (const gdb_byte *valaddr, struct type *type,
   if (domain != NULL)
     {
       char *name;
+
       fputs_filtered (prefix, stream);
       name = type_name_no_tag (domain);
       if (name)