about summary refs log tree commit diff
path: root/src/libstd/sys_common
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2017-11-15 18:01:09 +0100
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2018-01-26 04:49:54 +0100
commit634f8cc06a88eb978c5e52390014740c4bab1e33 (patch)
tree57d414588e236c301ad3c4ce49759771a6339e58 /src/libstd/sys_common
parenta0a9007f8d28234086f33c425bb996acd646bd14 (diff)
downloadrust-634f8cc06a88eb978c5e52390014740c4bab1e33.tar.gz
rust-634f8cc06a88eb978c5e52390014740c4bab1e33.zip
Print inlined functions on Windows
Diffstat (limited to 'src/libstd/sys_common')
-rw-r--r--src/libstd/sys_common/backtrace.rs3
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) =