btrace: temporarily set inferior_ptid in record_btrace_start_replaying

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

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 00fa4ba82420099e485624a77d32efbc4fbe4e3d..4c29c124f3d137caf166d949ed9dc08c54c719b2 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1332,7 +1332,7 @@ decode_line_2 (struct linespec_state *self,
 
   /* Prepare ITEMS array.  */
   items_count = result->nelts;
-  items = xmalloc (sizeof (*items) * items_count);
+  items = XNEWVEC (struct decode_line_2_item, items_count);
   make_cleanup (xfree, items);
   for (i = 0; i < items_count; ++i)
     {
@@ -3570,6 +3570,8 @@ minsym_found (struct linespec_state *self, struct objfile *objfile,
          sal.pc = MSYMBOL_VALUE_ADDRESS (objfile, msymbol);
          sal.pc = gdbarch_convert_from_func_ptr_addr (gdbarch, sal.pc,
                                                       &current_target);
+         if (gdbarch_skip_entrypoint_p (gdbarch))
+           sal.pc = gdbarch_skip_entrypoint (gdbarch, sal.pc);
        }
       else
        skip_prologue_sal (&sal);