Update framehop, object, gimli and addr2line.

Author: mstange

Cargo.lock

@@ -17,18 +17,18 @@ partial_read_stats = ["bytesize", "bitvec"]
 [dependencies.addr2line]
 default-features = false
 features = ["std", "fallible-iterator"]
-version = "0.21.0"
+version = "0.22"
 # path = "../../addr2line"
 
 [dependencies.gimli]
 default-features = false
 features = ["read"]
-version = "0.28.1"
+version = "0.29"
 
 [dependencies.object]
 default-features = false
 features = ["std", "read_core", "archive", "elf", "macho", "pe", "unaligned", "compression"]
-version = "0.34"
+version = "0.35"
 
 [dependencies]
 #pdb-addr2line = { path = "../../pdb-addr2line" }

samply-symbols/Cargo.toml

@@ -66,9 +66,7 @@ impl DebugIdExt for DebugId {
 /// Tries to obtain a DebugId for an object. This uses the build ID, if available,
 /// and falls back to hashing the first page of the text section otherwise.
 /// Returns None on failure.
-pub fn debug_id_for_object<'data: 'file, 'file>(
-    obj: &'file impl Object<'data, 'file>,
-) -> Option<DebugId> {
+pub fn debug_id_for_object<'data>(obj: &impl Object<'data>) -> Option<DebugId> {
     // Windows
     if let Ok(Some(pdb_info)) = obj.pdb_info() {
         return Some(DebugId::from_guid_age(&pdb_info.guid(), pdb_info.age()).unwrap());
@@ -102,9 +100,7 @@ pub fn debug_id_for_object<'data: 'file, 'file>(
 /// Tries to obtain a CodeId for an object.
 ///
 /// This currently only handles mach-O and ELF.
-pub fn code_id_for_object<'data: 'file, 'file>(
-    obj: &'file impl Object<'data, 'file>,
-) -> Option<CodeId> {
+pub fn code_id_for_object<'data>(obj: &impl Object<'data>) -> Option<CodeId> {
     // ELF
     if let Ok(Some(build_id)) = obj.build_id() {
         return Some(CodeId::ElfBuildId(ElfBuildId::from_bytes(build_id)));

samply-symbols/src/debugid_util.rs

@@ -74,15 +74,14 @@ pub enum SingleSectionData<'data, T: ReadRef<'data>> {
     Owned(Vec<u8>),
 }
 
-pub fn try_get_section_data<'data, 'file, O, T>(
+pub fn try_get_section_data<'data, O, T>(
     data: T,
-    file: &'file O,
+    file: &O,
     section_id: SectionId,
     is_for_dwo_dwp: bool,
 ) -> Option<SingleSectionData<'data, T>>
 where
-    'data: 'file,
-    O: object::Object<'data, 'file>,
+    O: object::Object<'data>,
     T: ReadRef<'data>,
 {
     use object::ObjectSection;
@@ -175,19 +174,17 @@ impl Addr2lineContextData {
         }
     }
 
-    fn sect<'data, 'ctxdata, 'file, O, R>(
+    fn sect<'data, 'ctxdata, O, R>(
         &'ctxdata self,
         data: R,
-        obj: &'file O,
+        obj: &O,
         section_id: SectionId,
         endian: RunTimeEndian,
         is_for_dwo_dwp: bool,
     ) -> EndianSlice<'ctxdata, RunTimeEndian>
     where
-        'data: 'file,
         'data: 'ctxdata,
-        'ctxdata: 'file,
-        O: object::Object<'data, 'file>,
+        O: object::Object<'data>,
         R: ReadRef<'data>,
     {
         let slice: &[u8] = match try_get_section_data(data, obj, section_id, is_for_dwo_dwp) {
@@ -202,18 +199,16 @@ impl Addr2lineContextData {
         EndianSlice::new(slice, endian)
     }
 
-    pub fn make_context<'data, 'ctxdata, 'file, O, R>(
+    pub fn make_context<'data, 'ctxdata, O, R>(
         &'ctxdata self,
         data: R,
-        obj: &'file O,
+        obj: &O,
         sup_data: Option<R>,
-        sup_obj: Option<&'file O>,
+        sup_obj: Option<&O>,
     ) -> Result<addr2line::Context<EndianSlice<'ctxdata, RunTimeEndian>>, Error>
     where
-        'data: 'file,
         'data: 'ctxdata,
-        'ctxdata: 'file,
-        O: object::Object<'data, 'file>,
+        O: object::Object<'data>,
         R: ReadRef<'data>,
     {
         let e = if obj.is_little_endian() {
@@ -233,18 +228,16 @@ impl Addr2lineContextData {
         Ok(context)
     }
 
-    pub fn make_package<'data, 'ctxdata, 'file, O, R>(
+    pub fn make_package<'data, 'ctxdata, O, R>(
         &'ctxdata self,
         data: R,
-        obj: &'file O,
+        obj: &O,
         dwp_data: Option<R>,
-        dwp_obj: Option<&'file O>,
+        dwp_obj: Option<&O>,
     ) -> Result<Option<DwarfPackage<EndianSlice<'ctxdata, RunTimeEndian>>>, Error>
     where
-        'data: 'file,
         'data: 'ctxdata,
-        'ctxdata: 'file,
-        O: object::Object<'data, 'file>,
+        O: object::Object<'data>,
         R: ReadRef<'data>,
     {
         let e = if obj.is_little_endian() {
@@ -270,16 +263,14 @@ impl Addr2lineContextData {
         Ok(package)
     }
 
-    pub fn make_dwarf_for_dwo<'data, 'ctxdata, 'file, O, R>(
+    pub fn make_dwarf_for_dwo<'data, 'ctxdata, O, R>(
         &'ctxdata self,
         data: R,
-        obj: &'file O,
+        obj: &O,
     ) -> Result<addr2line::gimli::Dwarf<EndianSlice<'ctxdata, RunTimeEndian>>, Error>
     where
-        'data: 'file,
         'data: 'ctxdata,
-        'ctxdata: 'file,
-        O: object::Object<'data, 'file>,
+        O: object::Object<'data>,
         R: ReadRef<'data>,
     {
         let e = if obj.is_little_endian() {

samply-symbols/src/dwarf.rs

@@ -482,13 +482,9 @@ impl<T: FileContents + 'static> ObjectSymbolMapOuter<T> for ElfSymbolMapDataAndO
     }
 }
 
-fn compute_function_addresses_elf<'data, 'file, O>(
-    object_file: &'file O,
-) -> (Option<Vec<u32>>, Option<Vec<u32>>)
-where
-    'data: 'file,
-    O: object::Object<'data, 'file>,
-{
+fn compute_function_addresses_elf<'data, O: object::Object<'data>>(
+    object_file: &O,
+) -> (Option<Vec<u32>>, Option<Vec<u32>>) {
     // Get an approximation of the list of function start addresses by
     // iterating over the exception handling info. Every FDE roughly
     // maps to one function.

samply-symbols/src/elf.rs

@@ -535,13 +535,12 @@ where
     Ok(image)
 }
 
-fn compute_function_addresses_macho<'data, 'file, O, R>(
-    macho_data: &'file MachOData<'data, R>,
-    object_file: &'file O,
+fn compute_function_addresses_macho<'data, O, R>(
+    macho_data: &MachOData<'data, R>,
+    object_file: &O,
 ) -> (Option<Vec<u32>>, Option<Vec<u32>>)
 where
-    'data: 'file,
-    O: object::Object<'data, 'file>,
+    O: object::Object<'data>,
     R: ReadRef<'data>,
 {
     // Get function start addresses from LC_FUNCTION_STARTS

samply-symbols/src/macho.rs

@@ -575,9 +575,7 @@ impl SourceFilePath {
 ///    0xffffffff81000000. Moreover, the base address seems to coincide with the
 ///    vmaddr of the .text section, which is readily-available in perf.data files
 ///    (in a synthetic mapping called "[kernel.kallsyms]_text").
-pub fn relative_address_base<'data: 'file, 'file>(
-    object_file: &'file impl object::Object<'data, 'file>,
-) -> u64 {
+pub fn relative_address_base<'data>(object_file: &impl object::Object<'data>) -> u64 {
     use object::read::ObjectSegment;
     if let Some(text_segment) = object_file
         .segments()

samply-symbols/src/shared.rs

@@ -89,7 +89,7 @@ impl<'a, Symbol: object::ObjectSymbol<'a> + 'a> SymbolList<'a, Symbol> {
     ) -> Self
     where
         'a: 'file,
-        O: object::Object<'a, 'file, Symbol = Symbol>,
+        O: object::Object<'a, Symbol<'file> = Symbol>,
     {
         let mut entries: Vec<_> = Vec::new();
 
@@ -308,9 +308,7 @@ impl SvmaFileRange {
 struct SvmaFileRanges(Vec<SvmaFileRange>);
 
 impl SvmaFileRanges {
-    pub fn from_object<'data: 'file, 'file, O: object::Object<'data, 'file>>(
-        object_file: &'file O,
-    ) -> Self {
+    pub fn from_object<'data, O: object::Object<'data>>(object_file: &O) -> Self {
         let mut svma_file_ranges: Vec<SvmaFileRange> = object_file
             .segments()
             .map(SvmaFileRange::from_segment)
@@ -647,7 +645,7 @@ pub struct ObjectSymbolMapInnerWrapper<'data, FC>(
 );
 
 impl<'a, FC: FileContents + 'static> ObjectSymbolMapInnerWrapper<'a, FC> {
-    pub fn new<'file, O, Symbol, DDM: DwoDwarfMaker<FC> + Sync>(
+    pub fn new<'file, O, Symbol, DDM>(
         object_file: &'file O,
         addr2line_context: Option<addr2line::Context<EndianSlice<'a, RunTimeEndian>>>,
         dwp_package: Option<addr2line::gimli::DwarfPackage<EndianSlice<'a, RunTimeEndian>>>,
@@ -658,8 +656,9 @@ impl<'a, FC: FileContents + 'static> ObjectSymbolMapInnerWrapper<'a, FC> {
     ) -> Self
     where
         'a: 'file,
-        O: object::Object<'a, 'file, Symbol = Symbol>,
+        O: object::Object<'a, Symbol<'file> = Symbol>,
         Symbol: object::ObjectSymbol<'a> + Send + Sync + 'a,
+        DDM: DwoDwarfMaker<FC> + Sync,
     {
         let base_address = relative_address_base(object_file);
         let list = SymbolList::new(

samply-symbols/src/symbol_map_object.rs

@@ -141,13 +141,9 @@ impl<T: FileContents + 'static> ObjectSymbolMapOuter<T> for PeSymbolMapDataAndOb
     }
 }
 
-fn compute_function_addresses_pe<'data, 'file, O>(
-    object_file: &'file O,
-) -> (Option<Vec<u32>>, Option<Vec<u32>>)
-where
-    'data: 'file,
-    O: object::Object<'data, 'file>,
-{
+fn compute_function_addresses_pe<'data, O: object::Object<'data>>(
+    object_file: &O,
+) -> (Option<Vec<u32>>, Option<Vec<u32>>) {
     // Get function start and end addresses from the function list in .pdata.
     use object::ObjectSection;
     if let Some(pdata) = object_file