Update gimli dependency to 0.33

Update the gimli dependency to 0.33. We will require this version in the
not-so-distant future to properly support ELF & DWARF relocations.

Signed-off-by: Daniel Müller <deso@posteo.net>

Author: d-e-s-o

Cargo.lock

@@ -174,7 +174,7 @@ codegen-units = 256
 
 [dependencies]
 cpp_demangle = {version = "0.5", optional = true}
-gimli = {version = "0.32", optional = true}
+gimli = {version = "0.33", optional = true}
 libc = "0.2"
 memmap2 = {version = "0.9", default-features = false}
 miniz_oxide = {version = "0.9", default-features = false, features = ["simd", "with-alloc"], optional = true}
@@ -187,7 +187,7 @@ zstd = {version = "0.13", default-features = false, optional = true}
 [dev-dependencies]
 # For performance comparison; pinned, because we use #[doc(hidden)]
 # APIs.
-addr2line = "=0.25.1"
+addr2line = "=0.26.0"
 anyhow = "1.0"
 blazesym-dev = {path = "dev", features = ["generate-unit-test-files"]}
 criterion = {version = "0.8", default-features = false, features = ["rayon", "cargo_bench_support"]}

Cargo.toml

@@ -49,7 +49,7 @@ fn name_entry<'dwarf>(
     let abbrev = if let Some(abbrev) = entries.read_abbreviation()? {
         abbrev
     } else {
-        return Err(gimli::Error::NoEntryAtGivenOffset)
+        return Err(gimli::Error::NoEntryAtGivenOffset(offset.0 as u64))
     };
 
     let mut name = None;
@@ -112,7 +112,7 @@ fn name_attr<'dwarf>(
 
 struct InlinedState<'call, 'dwarf> {
     // Mutable fields.
-    entries: gimli::EntriesRaw<'call, 'call, R<'dwarf>>,
+    entries: gimli::EntriesRaw<'call, R<'dwarf>>,
     functions: Vec<InlinedFunction<'dwarf>>,
     addresses: Vec<InlinedFunctionAddress>,
 
@@ -395,7 +395,7 @@ impl<'dwarf> Function<'dwarf> {
 
 
     fn skip(
-        entries: &mut gimli::EntriesRaw<'_, '_, R<'dwarf>>,
+        entries: &mut gimli::EntriesRaw<'_, R<'dwarf>>,
         abbrev: &gimli::Abbreviation,
         depth: isize,
     ) -> Result<(), Error> {

src/dwarf/function.rs

@@ -72,7 +72,7 @@ impl<'dwarf> Units<'dwarf> {
         let mut units = sections.units();
         while let Some(header) = units.next()? {
             let unit_id = res_units.len();
-            let offset = match header.offset().as_debug_info_offset() {
+            let offset = match header.offset().to_debug_info_offset(&header) {
                 Some(offset) => offset,
                 None => continue,
             };
@@ -268,13 +268,13 @@ impl<'dwarf> Units<'dwarf> {
             .binary_search_by_key(&offset.0, |unit| unit.offset().0)
         {
             // There is never a DIE at the unit offset or before the first unit.
-            Ok(_) | Err(0) => return Err(gimli::Error::NoEntryAtGivenOffset),
+            Ok(_) | Err(0) => return Err(gimli::Error::NoEntryAtGivenOffset(offset.0 as u64)),
             Err(i) => self.units[i - 1].dw_unit(),
         };
 
         let unit_offset = offset
             .to_unit_offset(&unit.header)
-            .ok_or(gimli::Error::NoEntryAtGivenOffset)?;
+            .ok_or(gimli::Error::NoEntryAtGivenOffset(offset.0 as u64))?;
         let unit = gimli::UnitRef::new(&self.dwarf, unit);
         Ok((unit, unit_offset))
     }