Update addr2line dependency to 0.15.0

Author: philipc

Cargo.toml

@@ -36,7 +36,7 @@ cpp_demangle = { default-features = false, version = "0.3.0", optional = true }
 
 # Optional dependencies enabled through the `gimli-symbolize` feature, do not
 # use these features directly.
-addr2line = { version = "0.14.1", optional = true, default-features = false }
+addr2line = { version = "0.15.0", optional = true, default-features = false }
 miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
 [dependencies.object]
 version = "0.23"

crates/as-if-std/Cargo.toml

@@ -15,7 +15,7 @@ bench = false
 cfg-if = "1.0"
 rustc-demangle = "0.1.4"
 libc = { version = "0.2.45", default-features = false }
-addr2line = { version = "0.14.1", default-features = false }
+addr2line = { version = "0.15.0", default-features = false }
 miniz_oxide = { version = "0.4.0", default-features = false }
 
 [dependencies.object]

src/symbolize/gimli.rs

@@ -85,27 +85,13 @@ struct Context<'a> {
 
 impl<'data> Context<'data> {
     fn new(stash: &'data Stash, object: Object<'data>) -> Option<Context<'data>> {
-        fn load_section<'data, S>(stash: &'data Stash, obj: &Object<'data>) -> S
-        where
-            S: gimli::Section<gimli::EndianSlice<'data, Endian>>,
-        {
-            let data = obj.section(stash, S::section_name()).unwrap_or(&[]);
-            S::from(EndianSlice::new(data, Endian))
-        }
-
-        let dwarf = addr2line::Context::from_sections(
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            load_section(stash, &object),
-            gimli::EndianSlice::new(&[], Endian),
-        )
+        let sections = gimli::Dwarf::load(|id| -> Result<_, ()> {
+            let data = object.section(stash, id.name()).unwrap_or(&[]);
+            Ok(EndianSlice::new(data, Endian))
+        })
         .ok()?;
+        let dwarf = addr2line::Context::from_dwarf(sections).ok()?;
+
         Some(Context { dwarf, object })
     }
 }