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