From de9a66e3bbc3f287229cad892108e46ac44b2bdf Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 19 Aug 2009 17:07:30 -0700
Subject: [PATCH] Use dwarf_diename instead of a DW_AT_name lookup

We should always use the canonical dwarf_diename.  The code being
replaced here wasn't even using dwarf_attr_integrate, so it may have
been missing the accessibility of some names.

* dwflpp.cxx (dwflpp::iterate_over_labels): Use dwarf_diename.
---
 dwflpp.cxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dwflpp.cxx b/dwflpp.cxx
index 192973f2c..dcf046787 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -937,10 +937,8 @@ dwflpp::iterate_over_labels (Dwarf_Die *begin_die,
   static string function_name = dwarf_diename (begin_die);
   do
     {
-      Dwarf_Attribute attr_mem;
-      Dwarf_Attribute *attr = dwarf_attr (&die, DW_AT_name, &attr_mem);
       int tag = dwarf_tag(&die);
-      const char *name = dwarf_formstring (attr);
+      const char *name = dwarf_diename (&die);
       if (name == 0)
         continue;
       switch (tag)
-- 
2.43.5