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.

1 files changed, 2 insertions, 3 deletions

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);