Remove function comparison from label iteration

We already have filtered functions and inlines, so just iterate in each
of those to look for labels.

* dwflpp.cxx (dwflpp::iterate_over_labels): Assume that the die we're
  looking at is already a matching function, and don't descend into
  inlined functions in this body.
* tapsets.cxx (query_srcfile_label): Iterate through inlines too.
  (query_cu): Iterate over functions and inlines instead of the CU.

3 files changed, 37 insertions, 33 deletions

diff --git a/dwflpp.cxx b/dwflpp.cxx
index dcf4182d..10127c61 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -1138,7 +1138,7 @@ dwflpp::iterate_over_srcfile_lines (char const * srcfile,
 void
 dwflpp::iterate_over_labels (Dwarf_Die *begin_die,
                              const string& sym,
-                             const string& symfunction,
+                             const string& function,
                              dwarf_query *q,
                              void (* callback)(const string &,
                                                const char *,
@@ -1146,62 +1146,52 @@ dwflpp::iterate_over_labels (Dwarf_Die *begin_die,
                                                int,
                                                Dwarf_Die *,
                                                Dwarf_Addr,
-                                               dwarf_query *),
-                             const string& current_function)
+                                               dwarf_query *))
 {
   get_module_dwarf();
 
   Dwarf_Die die;
+  const char *name;
   int res = dwarf_child (begin_die, &die);
   if (res != 0)
     return;  // die without children, bail out.
 
-  bool function_match =
-    (current_function == symfunction
-     || (name_has_wildcard(symfunction)
-         && function_name_matches_pattern (current_function, symfunction)));
-
   do
     {
-      int tag = dwarf_tag(&die);
-      const char *name = dwarf_diename (&die);
-      bool subfunction = false;
-
-      switch (tag)
+      switch (dwarf_tag(&die))
         {
         case DW_TAG_label:
-          if (function_match && name &&
+          name = dwarf_diename (&die);
+          if (name &&
               (name == sym
                || (name_has_wildcard(sym)
                    && function_name_matches_pattern (name, sym))))
             {
-              // Get the file/line number for this label
-              int dline;
-              const char *file = dwarf_decl_file (&die);
-              dwarf_decl_line (&die, &dline);
-
               // Don't try to be smart. Just drop no addr labels.
               Dwarf_Addr stmt_addr;
               if (dwarf_lowpc (&die, &stmt_addr) == 0)
                 {
+                  // Get the file/line number for this label
+                  int dline;
+                  const char *file = dwarf_decl_file (&die);
+                  dwarf_decl_line (&die, &dline);
+
                   vector<Dwarf_Die> scopes = getscopes_die(&die);
                   if (scopes.size() > 1)
-                    callback(current_function, name, file, dline,
+                    callback(function, name, file, dline,
                              &scopes[1], stmt_addr, q);
                 }
             }
           break;
 
         case DW_TAG_subprogram:
-          if (dwarf_hasattr(&die, DW_AT_declaration) || !name)
-            break;
         case DW_TAG_inlined_subroutine:
-          if (name)
-            subfunction = true;
+          // Stay within our filtered function
+          break;
+
         default:
           if (dwarf_haschildren (&die))
-            iterate_over_labels (&die, sym, symfunction, q, callback,
-                                 subfunction ? name : current_function);
+            iterate_over_labels (&die, sym, function, q, callback);
           break;
         }
     }
diff --git a/dwflpp.h b/dwflpp.h
index d379b265..ab2ffe25 100644
--- a/dwflpp.h
+++ b/dwflpp.h
@@ -230,7 +230,7 @@ struct dwflpp
 
   void iterate_over_labels (Dwarf_Die *begin_die,
                             const std::string& sym,
-                            const std::string& symfunction,
+                            const std::string& function,
                             dwarf_query *q,
                             void (* callback)(const std::string &,
                                               const char *,
@@ -238,8 +238,7 @@ struct dwflpp
                                               int,
                                               Dwarf_Die *,
                                               Dwarf_Addr,
-                                              dwarf_query *),
-                            const std::string& current_function);
+                                              dwarf_query *));
 
   void collect_srcfiles_matching (std::string const & pattern,
                                   std::set<std::string> & filtered_srcfiles);
diff --git a/tapsets.cxx b/tapsets.cxx
index f5be7a4e..977a92fa 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -1207,8 +1207,14 @@ query_srcfile_label (const dwarf_line_t& line, void * arg)
   for (func_info_map_t::iterator i = q->filtered_functions.begin();
        i != q->filtered_functions.end(); ++i)
     if (q->dw.die_has_pc (i->die, addr))
-      q->dw.iterate_over_labels (&i->die, q->label_val, q->function,
-                                 q, query_label, i->name);
+      q->dw.iterate_over_labels (&i->die, q->label_val, i->name,
+                                 q, query_label);
+
+  for (inline_instance_map_t::iterator i = q->filtered_inlines.begin();
+       i != q->filtered_inlines.end(); ++i)
+    if (q->dw.die_has_pc (i->die, addr))
+      q->dw.iterate_over_labels (&i->die, q->label_val, i->name,
+                                 q, query_label);
 }
 
 static void
@@ -1503,8 +1509,17 @@ query_cu (Dwarf_Die * cudie, void * arg)
 	  if (q->has_label)
 	    {
 	      if (q->line[0] == 0)		// No line number specified
-                q->dw.iterate_over_labels (q->dw.cu, q->label_val, q->function,
-                                           q, query_label, "");
+                {
+                  for (func_info_map_t::iterator i = q->filtered_functions.begin();
+                       i != q->filtered_functions.end(); ++i)
+                    q->dw.iterate_over_labels (&i->die, q->label_val, i->name,
+                                               q, query_label);
+
+                  for (inline_instance_map_t::iterator i = q->filtered_inlines.begin();
+                       i != q->filtered_inlines.end(); ++i)
+                    q->dw.iterate_over_labels (&i->die, q->label_val, i->name,
+                                               q, query_label);
+                }
 	      else
 		for (set<string>::const_iterator i = q->filtered_srcfiles.begin();
 		     i != q->filtered_srcfiles.end(); ++i)