f3cfdd
commit 578e60102871d11ed8c18d36f6286f3a96258d8f
f3cfdd
Author: Ryan Goldberg <rgoldber@redhat.com>
f3cfdd
Date:   Thu Dec 1 16:15:44 2022 -0500
f3cfdd
f3cfdd
    PR29676: Wildcard expansion fix for labels
f3cfdd
    
f3cfdd
    PR29676, introduced an bug where function symbols from the symbol
f3cfdd
    table were expanded in the function component resulting in wildcards
f3cfdd
    not being expanded in labels. This fix, removes the issue by restricting
f3cfdd
    the symbol table query to probes which don't need further debuginfo to
f3cfdd
    expand.
f3cfdd
f3cfdd
diff --git a/tapsets.cxx b/tapsets.cxx
f3cfdd
index 0ec71ebda..46b10f26e 100644
f3cfdd
--- a/tapsets.cxx
f3cfdd
+++ b/tapsets.cxx
f3cfdd
@@ -1256,7 +1256,11 @@ dwarf_query::handle_query_module()
f3cfdd
   // in the symbol table but not in dwarf and minidebuginfo is
f3cfdd
   // located in the gnu_debugdata section, alias_dupes checking
f3cfdd
   // is done before adding any probe points
f3cfdd
-  if(!pending_interrupts)
f3cfdd
+  // PR29676.   Some probes require additional debuginfo
f3cfdd
+  // to expand wildcards (ex. .label, .callee). Since the debuginfo is
f3cfdd
+  // not available, don't bother looking in the symbol table for these results.
f3cfdd
+  // This can result in 0 results, if there is no dwarf info present
f3cfdd
+  if(!pending_interrupts && !(has_label || has_callee || has_callees_num))
f3cfdd
     query_module_symtab();
f3cfdd
 }
f3cfdd
 
f3cfdd