Merge commit 'origin/master' into pr7043

1 files changed, 13 insertions, 0 deletions

diff --git a/dwarf_wrappers.cxx b/dwarf_wrappers.cxx
index 3627b989..d7183dc3 100644
--- a/dwarf_wrappers.cxx
+++ b/dwarf_wrappers.cxx
@@ -12,6 +12,7 @@
 #include <cstring>
 #include <string>
 #include <elfutils/libdwfl.h>
+#include <dwarf.h>
 
 using std::string;
 
@@ -45,4 +46,16 @@ void dwfl_assert(const std::string& desc, bool condition)
         dwfl_assert(desc, -1);
 }
 
+
+// Helper for dealing with selected portions of libdwfl in a more readable
+// fashion, and with specific cleanup / checking / logging options.
+
+const char *
+dwarf_diename_integrate (Dwarf_Die *die)
+{
+  Dwarf_Attribute attr_mem;
+  return dwarf_formstring (dwarf_attr_integrate (die, DW_AT_name, &attr_mem));
+}
+
+
 /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */