From b5b9879fc10e96e37d89b84922bf11f6ed4ccb34 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Fri, 28 Feb 2014 13:57:38 -0500
Subject: [PATCH] PR6941: also skip prologue search for function(NUM) probes

Whoops! That should have been part of the previous commit as well.
---
 tapsets.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tapsets.cxx b/tapsets.cxx
index 7eaaf4864..af6af0690 100644
--- 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;
-- 
2.43.5