Handle supplementary object files

.github/workflows/rust.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest"]
-        rust_channel: ["stable", "beta", "nightly", "1.38.0"]
+        rust_channel: ["stable", "beta", "nightly", "1.42.0"]
         include:
           - rust_channel: "stable"
             os: "macOS-latest"

Cargo.toml

@@ -17,7 +17,7 @@ travis-ci = { repository = "gimli-rs/addr2line" }
 [dependencies]
 gimli = { version = "0.23", default-features = false, features = ["read"] }
 fallible-iterator = { version = "0.2", default-features = false, optional = true }
-object = { version = "0.22", default-features = false, features = ["read"], optional = true }
+object = { version = "0.23", default-features = false, features = ["read"], optional = true }
 smallvec = { version = "1", default-features = false, optional = true }
 rustc-demangle = { version = "0.1", optional = true }
 cpp_demangle = { version = "0.3", default-features = false, optional = true }

examples/addr2line.rs

@@ -89,6 +89,12 @@ fn main() {
                 )
                 .required(true),
         )
+        .arg(
+            Arg::with_name("sup")
+                .long("sup")
+                .value_name("filename")
+                .help("Path to supplementary object file."),
+        )
         .arg(
             Arg::with_name("functions")
                 .short("f")
@@ -153,10 +159,19 @@ fn main() {
 
     let file = File::open(path).unwrap();
     let map = unsafe { memmap::Mmap::map(&file).unwrap() };
-    let file = &object::File::parse(&*map).unwrap();
+    let object = &object::File::parse(&*map).unwrap();
+
+    let sup_map;
+    let sup_object = if let Some(sup_path) = matches.value_of("sup") {
+        let sup_file = File::open(sup_path).unwrap();
+        sup_map = unsafe { memmap::Mmap::map(&sup_file).unwrap() };
+        Some(object::File::parse(&*sup_map).unwrap())
+    } else {
+        None
+    };
 
-    let symbols = file.symbol_map();
-    let ctx = Context::new(file).unwrap();
+    let symbols = object.symbol_map();
+    let ctx = Context::new_with_sup(object, sup_object.as_ref()).unwrap();
 
     let stdin = std::io::stdin();
     let addrs = matches