Add compunits range adapter to objfile

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

diff --git a/gdb/source.c b/gdb/source.c
index 74c895c27b8d10bf4a92932aa937517eb4c76ed6..d070958e852213c73b8c7f41287e4d5309279842 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -238,9 +238,6 @@ clear_current_source_symtab_and_line (void)
 void
 select_source_symtab (struct symtab *s)
 {
-  struct objfile *ofp;
-  struct compunit_symtab *cu;
-
   if (s)
     {
       current_source_symtab = s;
@@ -272,23 +269,29 @@ select_source_symtab (struct symtab *s)
 
   current_source_line = 1;
 
-  ALL_FILETABS (ofp, cu, s)
+  for (objfile *ofp : current_program_space->objfiles ())
     {
-      const char *name = s->filename;
-      int len = strlen (name);
-
-      if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
-                       || strcmp (name, "<<C++-namespaces>>") == 0)))
+      for (compunit_symtab *cu : ofp->compunits ())
        {
-         current_source_pspace = current_program_space;
-         current_source_symtab = s;
+         for (symtab *symtab : compunit_filetabs (cu))
+           {
+             const char *name = symtab->filename;
+             int len = strlen (name);
+
+             if (!(len > 2 && (strcmp (&name[len - 2], ".h") == 0
+                               || strcmp (name, "<<C++-namespaces>>") == 0)))
+               {
+                 current_source_pspace = current_program_space;
+                 current_source_symtab = symtab;
+               }
+           }
        }
     }
 
   if (current_source_symtab)
     return;
 
-  for (objfile *objfile : all_objfiles (current_program_space))
+  for (objfile *objfile : current_program_space->objfiles ())
     {
       if (objfile->sf)
        s = objfile->sf->qf->find_last_source_symtab (objfile);
@@ -350,20 +353,20 @@ show_directories_command (struct ui_file *file, int from_tty,
 void
 forget_cached_source_info_for_objfile (struct objfile *objfile)
 {
-  struct compunit_symtab *cu;
-  struct symtab *s;
-
-  ALL_OBJFILE_FILETABS (objfile, cu, s)
+  for (compunit_symtab *cu : objfile->compunits ())
     {
-      if (s->line_charpos != NULL)
-       {
-         xfree (s->line_charpos);
-         s->line_charpos = NULL;
-       }
-      if (s->fullname != NULL)
+      for (symtab *s : compunit_filetabs (cu))
        {
-         xfree (s->fullname);
-         s->fullname = NULL;
+         if (s->line_charpos != NULL)
+           {
+             xfree (s->line_charpos);
+             s->line_charpos = NULL;
+           }
+         if (s->fullname != NULL)
+           {
+             xfree (s->fullname);
+             s->fullname = NULL;
+           }
        }
     }
 
@@ -379,7 +382,7 @@ forget_cached_source_info (void)
   struct program_space *pspace;
 
   ALL_PSPACES (pspace)
-    for (objfile *objfile : all_objfiles (pspace))
+    for (objfile *objfile : pspace->objfiles ())
       {
        forget_cached_source_info_for_objfile (objfile);
       }