Fix build errors

Author: Kai Luo

src/symbolize/gimli.rs

@@ -204,7 +204,7 @@ cfg_if::cfg_if! {
         use self::macho::{handle_split_dwarf, Object};
     } else if #[cfg(target_os = "aix")] {
         mod xcoff;
-        use self::xcoff::Object;
+        use self::xcoff::{handle_split_dwarf, Object};
     } else {
         mod elf;
         use self::elf::{handle_split_dwarf, Object};
@@ -435,7 +435,7 @@ pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol))
             None => return,
         };
         let mut any_frames = false;
-        if let Ok(mut frames) = cx.dwarf.find_frames(addr as u64).skip_all_loads() {
+        if let Ok(mut frames) = cx.find_frames(stash, addr as u64) {
             while let Ok(Some(frame)) = frames.next() {
                 any_frames = true;
                 let name = match frame.function {
@@ -451,7 +451,7 @@ pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol))
         }
         if !any_frames {
             if let Some((object_cx, object_addr)) = cx.object.search_object_map(addr as u64) {
-                if let Ok(mut frames) = object_cx.dwarf.find_frames(object_addr).skip_all_loads() {
+                if let Ok(mut frames) = object_cx.find_frames(stash, object_addr) {
                     while let Ok(Some(frame)) = frames.next() {
                         any_frames = true;
                         call(Symbol::Frame {

src/symbolize/gimli/xcoff.rs

@@ -1,7 +1,8 @@
 use super::mystd::ffi::{OsStr, OsString};
 use super::mystd::os::unix::ffi::OsStrExt;
 use super::mystd::str;
-use super::{Context, Mapping, Path, Stash, Vec};
+use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec};
+use alloc::sync::Arc;
 use core::ops::Deref;
 use object::read::archive::ArchiveFile;
 use object::read::xcoff::{FileHeader, SectionHeader, XcoffFile, XcoffSymbol};
@@ -20,7 +21,7 @@ impl Mapping {
         let map = super::mmap(path)?;
         Mapping::mk(map, |data, stash| {
             if member_name.is_empty() {
-                Context::new(stash, Object::parse(data)?, None)
+                Context::new(stash, Object::parse(data)?, None, None)
             } else {
                 let archive = ArchiveFile::parse(data).ok()?;
                 for member in archive.members() {
@@ -29,7 +30,7 @@ impl Mapping {
                         if name == member_name {
                             let member_data = member.data(data).ok()?;
                             if let Some(obj) = Object::parse(member_data) {
-                                return Context::new(stash, obj, None);
+                                return Context::new(stash, obj, None, None);
                             }
                         }
                     }
@@ -164,3 +165,11 @@ impl<'a> Object<'a> {
         None
     }
 }
+
+pub(super) fn handle_split_dwarf<'data>(
+    _package: Option<&gimli::DwarfPackage<EndianSlice<'data, Endian>>>,
+    _stash: &'data Stash,
+    _load: addr2line::SplitDwarfLoad<EndianSlice<'data, Endian>>,
+) -> Option<Arc<gimli::Dwarf<EndianSlice<'data, Endian>>>> {
+    None
+}