Changes for gimli-rs/object#133

Author: bjorn3

Cargo.lock

@@ -45,6 +45,10 @@ features = ["compression", "read", "std"] # We don't need WASM support
 #[patch.crates-io]
 #gimli = { path = "../" }
 
+[patch.crates-io]
+# FIXME switch back to crates.io once gimli-rs/object#133 is published
+object = { git = "https://github.com/gimli-rs/object.git" }
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cranelift-simplejit = { git = "https://github.com/CraneStation/cranelift.git" }
 

Cargo.toml

@@ -149,13 +149,7 @@ impl WriteDebugInfo for ObjectProduct {
             }
             DebugRelocName::Symbol(id) => {
                 let symbol_id = self.function_symbol(*symbol_map.get_index(id).unwrap().0);
-                let symbol = self.object.symbol(symbol_id);
-
-                // A symbol gets a section assigned when `add_symbol_data` is called.
-                let section = symbol.section.expect("Symbol not defined");
-                let symbol_offset = symbol.value;
-
-                (self.object.section_symbol(section), symbol_offset)
+                self.object.symbol_section_and_offset(symbol_id).expect("Debug reloc for undef sym???")
             }
         };
         self.object.add_relocation(from.0, Relocation {