read: add Unit::dwo_id

gimli-rs · Jul 16, 2021 · 78ec1c6 · 78ec1c6
1 parent 148e4ce
commit 78ec1c6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 47 deletions.
diff --git a/examples/dwarfdump.rs b/examples/dwarfdump.rs
@@ -613,23 +613,7 @@ where
             dwo_parent_units = match dwo_parent
                 .units()
                 .map(|unit_header| dwo_parent.unit(unit_header))
-                .filter_map(|unit| {
-                    let dwo_id = match unit.header.type_() {
-                        gimli::UnitType::Skeleton(dwo_id) => dwo_id,
-                        gimli::UnitType::Compilation => {
-                            let mut entries = unit.entries();
-                            let (_, this) = entries.next_dfs()?.unwrap();
-                            match this.attr_value(gimli::constants::DW_AT_GNU_dwo_id)? {
-                                Some(gimli::AttributeValue::DwoId(dwo_id)) => dwo_id,
-                                Some(_) => unreachable!(),
-                                None => return Ok(None),
-                            }
-                        }
-                        _ => return Ok(None),
-                    };
-
-                    Ok(Some((dwo_id, unit)))
-                })
+                .filter_map(|unit| Ok(unit.dwo_id.map(|dwo_id| (dwo_id, unit))))
                 .collect()
             {
                 Ok(units) => units,
@@ -1059,34 +1043,7 @@ where
         };
 
         if flags.dwo {
-            if let Some(dwo_id) = match unit.header.type_() {
-                UnitType::SplitCompilation(dwo_id) => Some(dwo_id),
-                UnitType::Compilation => {
-                    let mut entries = unit.entries();
-                    let this = match entries.next_dfs() {
-                        Ok(v) => v.unwrap().1,
-                        Err(err) => {
-                            writeln_error(buf, dwarf, err.into(), "Failed to load CU root unit")?;
-                            return Ok(());
-                        }
-                    };
-                    match this.attr_value(gimli::constants::DW_AT_GNU_dwo_id) {
-                        Ok(None) => None,
-                        Ok(Some(gimli::AttributeValue::DwoId(v))) => Some(v),
-                        Ok(Some(_)) => unreachable!(),
-                        Err(err) => {
-                            writeln_error(
-                                buf,
-                                dwarf,
-                                err.into(),
-                                "Failed to parse DW_AT_GNU_dwo_id",
-                            )?;
-                            return Ok(());
-                        }
-                    }
-                }
-                _ => None,
-            } {
+            if let Some(dwo_id) = unit.dwo_id {
                 if let Some(parent_unit) = dwo_parent_units.get(&dwo_id) {
                     unit.copy_relocated_attributes(parent_unit);
                 }

diff --git a/src/read/dwarf.rs b/src/read/dwarf.rs
@@ -4,7 +4,7 @@ use alloc::sync::Arc;
 use crate::common::{
     DebugAddrBase, DebugAddrIndex, DebugInfoOffset, DebugLineStrOffset, DebugLocListsBase,
     DebugLocListsIndex, DebugRngListsBase, DebugRngListsIndex, DebugStrOffset, DebugStrOffsetsBase,
-    DebugStrOffsetsIndex, DebugTypesOffset, DwarfFileType, Encoding, LocationListsOffset,
+    DebugStrOffsetsIndex, DebugTypesOffset, DwarfFileType, DwoId, Encoding, LocationListsOffset,
     RangeListsOffset, RawRangeListsOffset, SectionId, UnitSectionOffset,
 };
 use crate::constants;
@@ -14,7 +14,7 @@ use crate::read::{
     DebugTypesUnitHeadersIter, DebuggingInformationEntry, EntriesCursor, EntriesRaw, EntriesTree,
     Error, IncompleteLineProgram, LocListIter, LocationLists, Range, RangeLists, RawLocListIter,
     RawRngListIter, Reader, ReaderOffset, ReaderOffsetId, Result, RngListIter, Section, UnitHeader,
-    UnitOffset,
+    UnitOffset, UnitType,
 };
 
 /// All of the commonly used DWARF sections, and other common information.
@@ -602,6 +602,9 @@ where
 
     /// The line number program of the unit.
     pub line_program: Option<IncompleteLineProgram<R, Offset>>,
+
+    /// The DWO ID of a skeleton unit or split compilation unit.
+    pub dwo_id: Option<DwoId>,
 }
 
 impl<R: Reader> Unit<R> {
@@ -629,6 +632,10 @@ impl<R: Reader> Unit<R> {
                 dwarf.file_type,
             ),
             line_program: None,
+            dwo_id: match header.type_() {
+                UnitType::Skeleton(dwo_id) | UnitType::SplitCompilation(dwo_id) => Some(dwo_id),
+                _ => None,
+            },
             header,
         };
         let mut name = None;
@@ -677,6 +684,11 @@ impl<R: Reader> Unit<R> {
                             unit.rnglists_base = base;
                         }
                     }
+                    constants::DW_AT_GNU_dwo_id => {
+                        if let AttributeValue::DwoId(dwo_id) = attr.value() {
+                            unit.dwo_id = Some(dwo_id);
+                        }
+                    }
                     _ => {}
                 }
             }

diff --git a/src/write/loc.rs b/src/write/loc.rs
@@ -517,6 +517,7 @@ mod tests {
                         loclists_base: DebugLocListsBase(0),
                         rnglists_base: DebugRngListsBase(0),
                         line_program: None,
+                        dwo_id: None,
                     };
                     let context = ConvertUnitContext {
                         dwarf: &dwarf,

diff --git a/src/write/op.rs b/src/write/op.rs
@@ -1583,6 +1583,7 @@ mod tests {
                         loclists_base: DebugLocListsBase(0),
                         rnglists_base: DebugRngListsBase(0),
                         line_program: None,
+                        dwo_id: None,
                     };
 
                     let mut entry_ids = HashMap::new();

diff --git a/src/write/range.rs b/src/write/range.rs
@@ -384,6 +384,7 @@ mod tests {
                         loclists_base: DebugLocListsBase(0),
                         rnglists_base: DebugRngListsBase(0),
                         line_program: None,
+                        dwo_id: None,
                     };
                     let context = ConvertUnitContext {
                         dwarf: &dwarf,

diff --git a/src/write/unit.rs b/src/write/unit.rs
@@ -2546,6 +2546,7 @@ mod tests {
                             loclists_base: DebugLocListsBase(0),
                             rnglists_base: DebugRngListsBase(0),
                             line_program: None,
+                            dwo_id: None,
                         };
 
                         let mut context = convert::ConvertUnitContext {
@@ -3018,6 +3019,7 @@ mod tests {
                             loclists_base: DebugLocListsBase(0),
                             rnglists_base: DebugRngListsBase(0),
                             line_program: None,
+                            dwo_id: None,
                         };
 
                         let mut context = convert::ConvertUnitContext {