[PATCH 3/3] gdb/coffread: simplify stab section detection

[Simon Marchi <simon.marchi@efficios.com>]

We look for stab sections for the sole purpose of emitting a warning if
we see one.  Simplify this by using a boolean to indicate if we saw a
stab section or not.  Simplify the search to just look for sections
starting with ".stab", it should be enough for this purpose.

Also, remove the make_scoped_restore that would overwrite the stab
section vector, I'm not sure why it's there.  It seems to me like it
would cause the warning to never be shown.

Change-Id: I56323189ffdaa2d06a96d457cdd999b23efa5979
---
 gdb/coffread.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 4fbe0fb9e461..5ab2e43a5aa0 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -47,7 +47,8 @@ struct coff_symfile_info
     file_ptr min_lineno_offset = 0;	/* Where in file lowest line#s are.  */
     file_ptr max_lineno_offset = 0;	/* 1+last byte of line#s in file.  */
 
-    std::vector<asection *> *stabsects;	/* .stab sections.  */
+    /* True if the symfile contains one section that starts with ".stab".  */
+    bool found_stab_section = false;
   };
 
 /* Key for COFF-associated data.  */
@@ -220,17 +221,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
   name = bfd_section_name (sectp);
 
   if (startswith (name, ".stab"))
-    {
-      const char *s;
-
-      /* We can have multiple .stab sections if linked with
-	 --split-by-reloc.  */
-      for (s = name + sizeof ".stab" - 1; *s != '\0'; s++)
-	if (!c_isdigit (*s))
-	  break;
-      if (*s == '\0')
-	csi->stabsects->push_back (sectp);
-    }
+    csi->found_stab_section = true;
 }
 
 struct coff_find_targ_sec_arg
@@ -594,10 +585,6 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
   info = coff_objfile_data_key.get (objfile);
   symfile_bfd = abfd;		/* Kludge for swap routines.  */
 
-  std::vector<asection *> stabsects;
-  scoped_restore restore_stabsects
-    = make_scoped_restore (&info->stabsects, &stabsects);
-
 /* WARNING WILL ROBINSON!  ACCESSING BFD-PRIVATE DATA HERE!  FIXME!  */
   num_symbols = bfd_get_symcount (abfd);	/* How many syms */
   symtab_offset = cdata->sym_filepos;	/* Symbol table file offset */
@@ -676,7 +663,7 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
   if (!(objfile->flags & OBJF_READNEVER))
     bfd_map_over_sections (abfd, coff_locate_sections, (void *) info);
 
-  if (!info->stabsects->empty())
+  if (info->found_stab_section)
     warning (_("stabs debug information is not supported."));
 
   if (dwarf2_initialize_objfile (objfile))
-- 
2.52.0