UGLY fix for borrowck errors

gimli-rs · Jun 2, 2018 · 66252bd · 66252bd
1 parent 881008c
commit 66252bd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -6,11 +6,13 @@ extern crate addr2line;
 extern crate memmap;
 extern crate object;
 extern crate test;
+extern crate typed_arena;
 
 use std::env;
 use std::fs::File;
 use std::path::{self, PathBuf};
 use std::process;
+use typed_arena::Arena;
 
 fn release_fixture_path() -> PathBuf {
     let mut path = PathBuf::new();
@@ -61,7 +63,8 @@ fn context_new_location(b: &mut test::Bencher) {
 
     with_file(&target, |file| {
         b.iter(|| {
-            addr2line::Context::new(file).unwrap();
+            let arena = Arena::new();
+            addr2line::Context::new(&arena, file).unwrap();
         });
     });
 }
@@ -72,7 +75,8 @@ fn context_new_with_functions(b: &mut test::Bencher) {
 
     with_file(&target, |file| {
         b.iter(|| {
-            addr2line::Context::new(file)
+            let arena = Arena::new();
+            addr2line::Context::new(&arena, file)
                 .unwrap();
         });
     });

diff --git a/examples/addr2line.rs b/examples/addr2line.rs
@@ -4,6 +4,7 @@ extern crate fallible_iterator;
 extern crate gimli;
 extern crate memmap;
 extern crate object;
+extern crate typed_arena;
 
 use std::fs::File;
 use std::path::Path;
@@ -13,6 +14,7 @@ use std::borrow::Cow;
 use clap::{App, Arg, Values};
 use fallible_iterator::FallibleIterator;
 use object::Object;
+use typed_arena::Arena;
 
 use addr2line::{Context, Location};
 
@@ -156,7 +158,8 @@ fn main() {
     let file = &object::File::parse(&*map).unwrap();
 
     let symbols = file.symbol_map();
-    let ctx = Context::new(file).unwrap();
+    let arena = Arena::new();
+    let ctx = Context::new(&arena, file).unwrap();
 
     let stdin = std::io::stdin();
     let addrs = matches

diff --git a/src/lib.rs b/src/lib.rs
@@ -120,7 +120,7 @@ fn read_ranges<R: gimli::Reader>(
 
 impl<'a> Context<gimli::EndianSlice<'a, gimli::RunTimeEndian>> {
     /// Construct a new `Context`.
-    pub fn new(file: &object::File<'a>) -> Result<Self, Error> {
+    pub fn new(arena: &'a Arena<Cow<'a, [u8]>>, file: &'a object::File<'a>) -> Result<Self, Error> {
         let endian = if file.is_little_endian() {
             gimli::RunTimeEndian::Little
         } else {
@@ -143,13 +143,12 @@ impl<'a> Context<gimli::EndianSlice<'a, gimli::RunTimeEndian>> {
             S::from(gimli::EndianSlice::new(data_ref, endian))
         }
 
-        let mut arena = Arena::new();
-        let debug_abbrev: gimli::DebugAbbrev<_> = load_section(&arena, file, endian);
-        let debug_info: gimli::DebugInfo<_> = load_section(&arena, file, endian);
-        let debug_line: gimli::DebugLine<_> = load_section(&arena, file, endian);
-        let debug_ranges: gimli::DebugRanges<_> = load_section(&arena, file, endian);
-        let debug_rnglists: gimli::DebugRngLists<_> = load_section(&arena, file, endian);
-        let debug_str: gimli::DebugStr<_> = load_section(&arena, file, endian);
+        let debug_abbrev: gimli::DebugAbbrev<_> = load_section(arena, file, endian);
+        let debug_info: gimli::DebugInfo<_> = load_section(arena, file, endian);
+        let debug_line: gimli::DebugLine<_> = load_section(arena, file, endian);
+        let debug_ranges: gimli::DebugRanges<_> = load_section(arena, file, endian);
+        let debug_rnglists: gimli::DebugRngLists<_> = load_section(arena, file, endian);
+        let debug_str: gimli::DebugStr<_> = load_section(arena, file, endian);
 
         let range_lists = gimli::RangeLists::new(debug_ranges, debug_rnglists)?;
 

diff --git a/tests/correctness.rs b/tests/correctness.rs
@@ -4,18 +4,21 @@ extern crate findshlibs;
 extern crate gimli;
 extern crate memmap;
 extern crate object;
+extern crate typed_arena;
 
 use std::fs::File;
 
 use findshlibs::{IterationControl, SharedLibrary, TargetSharedLibrary};
 use addr2line::Context;
+use typed_arena::Arena;
 
 #[test]
 fn correctness() {
     let file = File::open("/proc/self/exe").unwrap();
     let map = unsafe { memmap::Mmap::map(&file).unwrap() };
     let file = &object::File::parse(&*map).unwrap();
-    let ctx = Context::new(file).unwrap();
+    let arena = Arena::new();
+    let ctx = Context::new(&arena, file).unwrap();
 
     let mut bias = None;
     TargetSharedLibrary::each(|lib| {
@@ -40,7 +43,8 @@ fn zero_sequence() {
     let file = File::open("/proc/self/exe").unwrap();
     let map = unsafe { memmap::Mmap::map(&file).unwrap() };
     let file = &object::File::parse(&*map).unwrap();
-    let ctx = Context::new(file).unwrap();
+    let arena = Arena::new();
+    let ctx = Context::new(&arena, file).unwrap();
     for probe in 0..10 {
         assert!(ctx.find_location(probe).unwrap().is_none());
     }
@@ -51,7 +55,8 @@ fn zero_function() {
     let file = File::open("/proc/self/exe").unwrap();
     let map = unsafe { memmap::Mmap::map(&file).unwrap() };
     let file = &object::File::parse(&*map).unwrap();
-    let ctx = Context::new(file).unwrap();
+    let arena = Arena::new();
+    let ctx = Context::new(&arena, file).unwrap();
     for probe in 0..10 {
         assert!(ctx.find_frames(probe).unwrap().next().unwrap().is_none());
     }