Merge pull request #517 from khuey/dwo_names

Add dwo section names.

examples/dwarfdump.rs

@@ -363,11 +363,11 @@ struct Flags {
 }
 
 impl Flags {
-    fn section_name(&self, name: &str) -> String {
+    fn section_name(&self, id: gimli::SectionId) -> Option<&'static str> {
         if self.dwo {
-            format!("{}.dwo", name)
+            id.dwo_name()
         } else {
-            name.to_string()
+            Some(id.name())
         }
     }
 }
@@ -520,8 +520,8 @@ where
 
     let mut load_section = |id: gimli::SectionId| -> Result<_> {
         let mut relocations = RelocationMap::default();
-        let name = flags.section_name(id.name());
-        let data = match file.section_by_name(&name) {
+        let name = flags.section_name(id);
+        let data = match name.and_then(|name| file.section_by_name(&name)) {
             Some(ref section) => {
                 // DWO sections never have relocations, so don't bother.
                 if !flags.dwo {

src/common.rs

@@ -267,4 +267,18 @@ impl SectionId {
             SectionId::DebugTypes => ".debug_types",
         }
     }
+
+    /// Returns the ELF section name for this kind, when found in a .dwo file.
+    pub fn dwo_name(self) -> Option<&'static str> {
+        Some(match self {
+            SectionId::DebugAbbrev => ".debug_abbrev.dwo",
+            SectionId::DebugInfo => ".debug_info.dwo",
+            SectionId::DebugLine => ".debug_line.dwo",
+            SectionId::DebugLocLists => ".debug_loclists.dwo",
+            SectionId::DebugMacro => ".debug_macro.dwo",
+            SectionId::DebugStr => ".debug_str.dwo",
+            SectionId::DebugStrOffsets => ".debug_str_offsets.dwo",
+            _ => return None,
+        })
+    }
 }

src/read/mod.rs

@@ -567,6 +567,12 @@ pub trait Section<R>: From<R> {
         Self::id().name()
     }
 
+    /// Returns the ELF section name (if any) for this type when used in a dwo
+    /// file.
+    fn dwo_section_name() -> Option<&'static str> {
+        Self::id().dwo_name()
+    }
+
     /// Try to load the section using the given loader function.
     fn load<F, E>(f: F) -> core::result::Result<Self, E>
     where