diff options
| author | bors <bors@rust-lang.org> | 2018-01-26 12:18:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-26 12:18:00 +0000 |
| commit | a97cd17f5d71fb4ec362f4fbd79373a6e7ed7b82 (patch) | |
| tree | a36cec3088f2a98cdec77debdac9e4e807a29772 /src/libstd/sys_common | |
| parent | 566905030380151f90708fa340312c9ca2c6056c (diff) | |
| parent | 634f8cc06a88eb978c5e52390014740c4bab1e33 (diff) | |
| download | rust-a97cd17f5d71fb4ec362f4fbd79373a6e7ed7b82.tar.gz rust-a97cd17f5d71fb4ec362f4fbd79373a6e7ed7b82.zip | |
Auto merge of #47252 - Zoxc:backtrace-win, r=alexcrichton
Print inlined functions on Windows Split from https://github.com/rust-lang/rust/pull/45637 r? @alexcrichton
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/backtrace.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs index 36cbce2df75..a364a0392b3 100644 --- a/src/libstd/sys_common/backtrace.rs +++ b/src/libstd/sys_common/backtrace.rs @@ -41,6 +41,8 @@ pub struct Frame { pub exact_position: *const u8, /// Address of the enclosing function. pub symbol_addr: *const u8, + /// Which inlined function is this frame referring to + pub inline_context: u32, } /// Max number of frames to print. @@ -64,6 +66,7 @@ fn _print(w: &mut Write, format: PrintFormat) -> io::Result<()> { let mut frames = [Frame { exact_position: ptr::null(), symbol_addr: ptr::null(), + inline_context: 0, }; MAX_NB_FRAMES]; let (nb_frames, context) = unwind_backtrace(&mut frames)?; let (skipped_before, skipped_after) = |