DWO cleanups #569
DWO cleanups #569
Conversation
| }; | ||
| let dwo_parent = gimli::Dwarf::load(&mut load_dwo_parent_section)?; | ||
| dwarf.debug_addr = dwo_parent.debug_addr.clone(); | ||
| dwarf.ranges = dwo_parent.ranges.clone(); |
There was a problem hiding this comment.
debug_line/debug_line_str really should be copied from the parent, and ranges should be copied if and only if the dwo doesn't have debug_rnglists (in other words if this is the GNU split dwarf extension and not the standard DWARF 5 version)
There was a problem hiding this comment.
Ok. This isn't something I changed in this PR is it? This sounds like something to be addressed as part of adding a method to Dwarf to do this.
There was a problem hiding this comment.
Right, nothing changed here afaict.
src/read/dwarf.rs
Outdated
| @@ -671,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); | |||
There was a problem hiding this comment.
Should we check to see if this is already present? DW_AT_GNU_dwo_id shouldn't really be present in DWARF 5 programs.
There was a problem hiding this comment.
Ok. It shouldn't matter, but it doesn't take much to add the check.
| /// If this is a from a DWARF 4 DWO file, then it must additionally be offset by the | ||
| /// value of `DW_AT_GNU_ranges_base`. You can use `Unit::ranges_offset_from_raw` to do this. | ||
| #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | ||
| pub struct RawRangeListsOffset<T = usize>(pub T); |
There was a problem hiding this comment.
My only concern about this is that it might be confused as being related to raw_ranges, but I don't have a better suggestion for the name.
This allows us to distinguish offsets which may be relative to `DW_AT_GNU_ranges_base`.
|
Can we (you :) ) do a 0.25 with this? |
|
I will in a few days after an |
|
0.25 is released. |
Follow up to #568
r? @khuey