btrace: Use function segment index in call iterator.

[deliverable/binutils-gdb.git] / gdb / psymtab.c

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index d98a4af0d97ff807055f4374a3d3fac119da27d7..bb482ee2cb4afac36fff5b496474cc8e87f7f76e 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -770,10 +770,9 @@ psymtab_to_symtab (struct objfile *objfile, struct partial_symtab *pst)
   /* If it has not yet been read in, read it.  */
   if (!pst->readin)
     {
-      struct cleanup *back_to = increment_reading_symtab ();
+      scoped_restore decrementer = increment_reading_symtab ();
 
       (*pst->read_symtab) (pst, objfile);
-      do_cleanups (back_to);
     }
 
   return pst->compunit_symtab;
@@ -875,7 +874,7 @@ psym_forget_cached_source_info (struct objfile *objfile)
 
 static void
 print_partial_symbols (struct gdbarch *gdbarch,
-                      struct partial_symbol **p, int count, char *what,
+                      struct partial_symbol **p, int count, const char *what,
                       struct ui_file *outfile)
 {
   fprintf_filtered (outfile, "  %s partial symbols:\n", what);