about summary refs log tree commit diff
path: root/src/libstd/sys/cloudabi
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-26 12:18:00 +0000
committerbors <bors@rust-lang.org>2018-01-26 12:18:00 +0000
commita97cd17f5d71fb4ec362f4fbd79373a6e7ed7b82 (patch)
treea36cec3088f2a98cdec77debdac9e4e807a29772 /src/libstd/sys/cloudabi
parent566905030380151f90708fa340312c9ca2c6056c (diff)
parent634f8cc06a88eb978c5e52390014740c4bab1e33 (diff)
downloadrust-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/cloudabi')
-rw-r--r--src/libstd/sys/cloudabi/backtrace.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/sys/cloudabi/backtrace.rs b/src/libstd/sys/cloudabi/backtrace.rs
index 33d93179237..1b970187558 100644
--- a/src/libstd/sys/cloudabi/backtrace.rs
+++ b/src/libstd/sys/cloudabi/backtrace.rs
@@ -77,6 +77,7 @@ extern "C" fn trace_fn(
         cx.frames[cx.idx] = Frame {
             symbol_addr: symaddr as *mut u8,
             exact_position: ip as *mut u8,
+            inline_context: 0,
         };
         cx.idx += 1;
     }