PR6941: also skip prologue search for function(NUM) probes

Whoops! That should have been part of the previous commit as well.

diff --git a/tapsets.cxx b/tapsets.cxx
index 7eaaf48645ae96228d65d48d32c7dbeec4851354..af6af0690e51fb6e15ab02a3390c14ebae89974c 100644 (file)
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -1463,7 +1463,8 @@ query_addr(Dwarf_Addr addr, dwarf_query *q)
       if (!dw.die_entrypc(fnscope, &addr))
         return;
       if (dwarf_tag(fnscope) == DW_TAG_subprogram &&
-          (q->sess.prologue_searching || q->has_process)) // PR 6871
+          (q->sess.prologue_searching ||
+           (q->has_process && !q->dw.has_valid_locs()))) // PR 6871 && PR 6941
         {
           func_info func;
           func.die = *fnscope;