}
+#if !_ELFUTILS_PREREQ(0, 143)
+// Elfutils prior to 0.143 didn't use attr_integrate when looking up the
+// decl_file or decl_line, so the attributes would sometimes be missed. For
+// those old versions, we define custom implementations to do the integration.
+
+const char *
+dwarf_decl_file_integrate (Dwarf_Die *die)
+{
+ Dwarf_Attribute attr_mem;
+ Dwarf_Sword idx = 0;
+ if (dwarf_formsdata (dwarf_attr_integrate (die, DW_AT_decl_file, &attr_mem),
+ &idx) != 0
+ || idx == 0)
+ return NULL;
+
+ Dwarf_Die cudie;
+ Dwarf_Files *files = NULL;
+ if (dwarf_getsrcfiles (dwarf_diecu (die, &cudie, NULL, NULL),
+ &files, NULL) != 0)
+ return NULL;
+
+ return dwarf_filesrc(files, idx, NULL, NULL);
+}
+
+int
+dwarf_decl_line_integrate (Dwarf_Die *die, int *linep)
+{
+ Dwarf_Attribute attr_mem;
+ Dwarf_Sword line;
+
+ int res = dwarf_formsdata (dwarf_attr_integrate
+ (die, DW_AT_decl_line, &attr_mem),
+ &line);
+ if (res == 0)
+ *linep = line;
+
+ return res;
+}
+
+#endif // !_ELFUTILS_PREREQ(0, 143)
+
+
/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */
};
+#if !_ELFUTILS_PREREQ(0, 143)
+// Elfutils prior to 0.143 didn't use attr_integrate when looking up the
+// decl_file or decl_line, so the attributes would sometimes be missed. For
+// those old versions, we define custom implementations to do the integration.
+
+const char *dwarf_decl_file_integrate (Dwarf_Die *die);
+#define dwarf_decl_file dwarf_decl_file_integrate
+
+int dwarf_decl_line_integrate (Dwarf_Die *die, int *linep)
+ __nonnull_attribute__ (2);
+#define dwarf_decl_line dwarf_decl_line_integrate
+
+#endif // !_ELFUTILS_PREREQ(0, 143)
+
+
#endif
/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */
&& function_name_matches_pattern (name, sym)))
{
const char *file = dwarf_decl_file (&die);
+
// Get the line number for this label
- Dwarf_Attribute attr;
- dwarf_attr (&die,DW_AT_decl_line, &attr);
- Dwarf_Sword dline;
- dwarf_formsdata (&attr, &dline);
+ int dline;
+ dwarf_decl_line (&die, &dline);
+
Dwarf_Addr stmt_addr;
if (dwarf_lowpc (&die, &stmt_addr) != 0)
{
size_t nlines = 0;
// Get the line for this label
Dwarf_Line **aline;
- dwarf_getsrc_file (module_dwarf, file, (int)dline, 0, &aline, &nlines);
+ dwarf_getsrc_file (module_dwarf, file, dline, 0, &aline, &nlines);
// Get the address
for (size_t i = 0; i < nlines; i++)
{
if (nscopes > 1)
{
callback(function_name.c_str(), file,
- (int)dline, &scopes[1], stmt_addr, q);
+ dline, &scopes[1], stmt_addr, q);
add_label_name(q, name);
}
}