Skip to content

Commit

Permalink
gimli: Search object file symbol tables again
Browse files Browse the repository at this point in the history
This restores logic removed in #217 to search the symbol tables when
looking for symbol name information, consequently fixing a test which
was failing when turned on for gimli.
  • Loading branch information
alexcrichton committed Jul 8, 2019
1 parent 3f854f7 commit 6482e2d
Show file tree
Hide file tree
Showing 3 changed files with 233 additions and 132 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Expand Up @@ -33,15 +33,15 @@ cpp_demangle = { default-features = false, version = "0.2.3", optional = true }
addr2line = { version = "0.9.0", optional = true, default-features = false, features = ['std'] }
findshlibs = { version = "0.5.0", optional = true }
memmap = { version = "0.7.0", optional = true }
goblin = { version = "0.0.22", optional = true, default-features = false, features = ['std'] }
goblin = { version = "0.0.23", optional = true, default-features = false, features = ['std'] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.3", optional = true }
goblin = { version = "0.0.22", optional = true, default-features = false, features = ['pe32', 'pe64'] }
goblin = { version = "0.0.23", optional = true, default-features = false, features = ['pe32', 'pe64'] }
[target.'cfg(target_os = "macos")'.dependencies]
goblin = { version = "0.0.22", optional = true, default-features = false, features = ['mach32', 'mach64'] }
goblin = { version = "0.0.23", optional = true, default-features = false, features = ['mach32', 'mach64'] }
[target.'cfg(not(any(target_os = "macos", windows)))'.dependencies]
goblin = { version = "0.0.22", optional = true, default-features = false, features = ['elf32', 'elf64'] }
goblin = { version = "0.0.23", optional = true, default-features = false, features = ['elf32', 'elf64'] }

# Each feature controls the two phases of finding a backtrace: getting a
# backtrace and then resolving instruction pointers to symbols. The default
Expand Down
6 changes: 2 additions & 4 deletions ci/azure-test-all.yml
Expand Up @@ -53,7 +53,5 @@ steps:
displayName: "Test without debuginfo (libbacktrace)"
- bash: cd ./crates/without_debuginfo && cargo test --features 'libbacktrace coresymbolication'
displayName: "Test without debuginfo (coresymbolication)"
# TODO: there's a bug on stable Rust right now (1.35.0) which prevents testing
# gimli here, so disable this temporarily until 1.36.0 is released.
# - bash: cd ./crates/without_debuginfo && cargo test --features 'libbacktrace gimli-symbolize'
# displayName: "Test without debuginfo (gimli-symbolize)"
- bash: cd ./crates/without_debuginfo && cargo test --features 'libbacktrace gimli-symbolize'
displayName: "Test without debuginfo (gimli-symbolize)"

0 comments on commit 6482e2d

Please sign in to comment.