Uniquefy gdb.threads/attach-into-signal.exp

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

diff --git a/gdb/linespec.c b/gdb/linespec.c
index d2089b5dd9d1dae7324983e2d537110152b08083..81f526d6f6b1428ad405c9796d2d8bdb57e9cf2a 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1129,7 +1129,7 @@ find_methods (struct type *t, const char *name,
     {
       int method_counter;
 
-      CHECK_TYPEDEF (t);
+      t = check_typedef (t);
 
       /* Loop over each method name.  At this level, all overloads of a name
          are counted as a single name.  There is an inner loop which loops over
@@ -2717,7 +2717,7 @@ collect_one_symbol (struct symbol *sym, void *d)
     return 1; /* Continue iterating.  */
 
   t = SYMBOL_TYPE (sym);
-  CHECK_TYPEDEF (t);
+  t = check_typedef (t);
   if (TYPE_CODE (t) != TYPE_CODE_STRUCT
       && TYPE_CODE (t) != TYPE_CODE_UNION
       && TYPE_CODE (t) != TYPE_CODE_NAMESPACE)
@@ -3432,7 +3432,9 @@ collect_symbols (struct symbol *sym, void *data)
 }
 
 /* We've found a minimal symbol MSYMBOL in OBJFILE to associate with our
-   linespec; return the SAL in RESULT.  */
+   linespec; return the SAL in RESULT.  This function should return SALs
+   matching those from find_function_start_sal, otherwise false
+   multiple-locations breakpoints could be placed.  */
 
 static void
 minsym_found (struct linespec_state *self, struct objfile *objfile,
@@ -3454,7 +3456,23 @@ minsym_found (struct linespec_state *self, struct objfile *objfile,
     sal = find_pc_sect_line (pc, NULL, 0);
 
   if (self->funfirstline)
-    skip_prologue_sal (&sal);
+    {
+      if (sal.symtab != NULL
+         && (COMPUNIT_LOCATIONS_VALID (SYMTAB_COMPUNIT (sal.symtab))
+             || SYMTAB_LANGUAGE (sal.symtab) == language_asm))
+       {
+         /* If gdbarch_convert_from_func_ptr_addr does not apply then
+            sal.SECTION, sal.LINE&co. will stay correct from above.
+            If gdbarch_convert_from_func_ptr_addr applies then
+            sal.SECTION is cleared from above and sal.LINE&co. will
+            stay correct from the last find_pc_sect_line above.  */
+         sal.pc = MSYMBOL_VALUE_ADDRESS (objfile, msymbol);
+         sal.pc = gdbarch_convert_from_func_ptr_addr (gdbarch, sal.pc,
+                                                      &current_target);
+       }
+      else
+       skip_prologue_sal (&sal);
+    }
 
   if (maybe_add_address (self->addr_set, objfile->pspace, sal.pc))
     add_sal_to_sals (self, result, &sal, MSYMBOL_NATURAL_NAME (msymbol), 0);