diff options
| author | Mohsen Zohrevandi <mohsen.zohrevandi@fortanix.com> | 2023-11-14 13:27:57 -0800 |
|---|---|---|
| committer | Mohsen Zohrevandi <mohsen.zohrevandi@fortanix.com> | 2023-11-14 13:27:57 -0800 |
| commit | ec8c3d9992661f078152b0e1f53b1a96fce090ca (patch) | |
| tree | 4a34be56c3a38b2362a047d85e1a9fcb8ccda70d /library/std/src/backtrace.rs | |
| parent | 6e7ea03c268fea775b4b6b3edc49936272bd1d13 (diff) | |
| download | rust-ec8c3d9992661f078152b0e1f53b1a96fce090ca.tar.gz rust-ec8c3d9992661f078152b0e1f53b1a96fce090ca.zip | |
Move SGX-specific image base logic to sys_common
Diffstat (limited to 'library/std/src/backtrace.rs')
| -rw-r--r-- | library/std/src/backtrace.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/library/std/src/backtrace.rs b/library/std/src/backtrace.rs index c1874ffc5df..7fcf2ee358c 100644 --- a/library/std/src/backtrace.rs +++ b/library/std/src/backtrace.rs @@ -95,7 +95,7 @@ use crate::fmt; use crate::panic::UnwindSafe; use crate::sync::atomic::{AtomicUsize, Ordering::Relaxed}; use crate::sync::LazyLock; -use crate::sys_common::backtrace::{lock, output_filename}; +use crate::sys_common::backtrace::{lock, output_filename, set_image_base}; use crate::vec::Vec; /// A captured OS thread stack backtrace. @@ -327,11 +327,7 @@ impl Backtrace { let _lock = lock(); let mut frames = Vec::new(); let mut actual_start = None; - #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] - { - let image_base = crate::os::fortanix_sgx::mem::image_base(); - backtrace_rs::set_image_base(crate::ptr::from_exposed_addr_mut(image_base as _)); - } + set_image_base(); unsafe { backtrace_rs::trace_unsynchronized(|frame| { frames.push(BacktraceFrame { |