* buildsym.c (free_pending_blocks): Remove commented-out code.

        (make_blockvector): Likewise. Re-use free_pending_blocks.
        (end_symtab): Remove commented-out code.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 46275186b6f86fd30ed33f4aba1d727f84bbc2c2..c26f3f8a15078e0687101f2d24fc5f4b503206a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-23  Joel Brobecker  <brobecker@adacore.com>
+
+       * buildsym.c (free_pending_blocks): Remove commented-out code.
+       (make_blockvector): Likewise. Re-use free_pending_blocks.
+       (end_symtab): Remove commented-out code.
+
 2007-10-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * top.c (command_loop): Fix output for shrinkage.

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index aab5056207b10a1ce50bb4ba61817f4700b025e2..58bb908f3e76122a001d95c2ee9131a6e417e88c 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -198,17 +198,8 @@ really_free_pendings (void *dummy)
 void
 free_pending_blocks (void)
 {
-#if 0                          /* Now we make the links in the
-                                  objfile_obstack, so don't free
-                                  them.  */
-  struct pending_block *bnext, *bnext1;
-
-  for (bnext = pending_blocks; bnext; bnext = bnext1)
-    {
-      bnext1 = bnext->next;
-      xfree ((void *) bnext);
-    }
-#endif
+  /* The links are made in the objfile_obstack, so we only need to
+     reset PENDING_BLOCKS.  */
   pending_blocks = NULL;
 }
 
@@ -493,17 +484,7 @@ make_blockvector (struct objfile *objfile)
       BLOCKVECTOR_BLOCK (blockvector, --i) = next->block;
     }
 
-#if 0                          /* Now we make the links in the
-                                  obstack, so don't free them.  */
-  /* Now free the links of the list, and empty the list.  */
-
-  for (next = pending_blocks; next; next = next1)
-    {
-      next1 = next->next;
-      xfree (next);
-    }
-#endif
-  pending_blocks = NULL;
+  free_pending_blocks ();
 
 #if 1                          /* FIXME, shut this off after a while
                                   to speed up symbol reading.  */
@@ -976,14 +957,6 @@ end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
            {
              linetablesize = sizeof (struct linetable) +
                subfile->line_vector->nitems * sizeof (struct linetable_entry);
-#if 0
-             /* I think this is artifact from before it went on the
-                obstack. I doubt we'll need the memory between now
-                and when we free it later in this function.  */
-             /* First, shrink the linetable to make more memory.  */
-             subfile->line_vector = (struct linetable *)
-               xrealloc ((char *) subfile->line_vector, linetablesize);
-#endif
 
              /* Like the pending blocks, the line table may be
                 scrambled in reordered executables.  Sort it if