[PATCH 2/2] Generalize cu_sec_idx

Ulf Hermann ulf.hermann@qt.io
Fri Dec 8 14:44:00 GMT 2017


Apparently CUs can appear in other sections than IDX_debug_info and
IDX_types. Rather than relying on the indirect indication provided by
type_offset we compare the addresses directly to figure out which
section a given CU belongs to.

This fixes the dwarf-getmacros test.

Change-Id: I83260622b55d3778a38cd46427dba158d186c51e
---
  libdw/ChangeLog |  4 ++++
  libdw/libdwP.h  | 12 +++++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 996cd2e..508bf9c 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-08  Ulf Hermann  <ulf.hermann@qt.io>
+
+	* libdwP.h: Generalize cu_sec_idx to check all sections.
+
  2017-05-09  Ulf Hermann  <ulf.hermann@qt.io>
   	* libdwP.h: Fix check for the upper border of the range in 
__libdw_in_section.
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index e092d8e..8f3a95c 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -715,7 +715,17 @@ __libdw_read_offset (Dwarf *dbg, Dwarf *dbg_ret,
  static inline size_t
  cu_sec_idx (struct Dwarf_CU *cu)
  {
-  return cu->type_offset == 0 ? IDX_debug_info : IDX_debug_types;
+  for (int sec_index = IDX_debug_info; sec_index < IDX_last; ++sec_index)
+    {
+      Elf_Data *data = cu->dbg->sectiondata[sec_index];
+      if (data != NULL && data->d_buf != NULL
+          && cu->startp >= data->d_buf
+          && cu->startp < data->d_buf + data->d_size)
+        {
+          return sec_index;
+        }
+    }
+  return IDX_last;
  }
   static inline bool
-- 
2.8.1.windows.1



More information about the Elfutils-devel mailing list