Use private mangled __rust_begin_short_backtrace_*

src/libstd/rt.rs

@@ -54,7 +54,7 @@ fn lang_start(main: fn(), argc: isize, argv: *const *const u8) -> isize {
 
         // Let's run some code!
         let res = panic::catch_unwind(|| {
-            __rust_begin_backtrace_binary(main)
+            __rust_begin_short_backtrace_binary(main)
         });
         sys_common::cleanup();
         res.is_err()
@@ -68,8 +68,7 @@ fn lang_start(main: fn(), argc: isize, argv: *const *const u8) -> isize {
 }
 
 /// Fixed frame used to clean the backtrace with `RUST_BACKTRACE=1`.
-#[no_mangle]
 #[inline(never)]
-pub fn __rust_begin_backtrace_binary(f: fn()) {
+fn __rust_begin_short_backtrace_binary(f: fn()) {
     f()
 }

src/libstd/sys_common/backtrace.rs

@@ -128,13 +128,6 @@ fn filter_frames(frames: &[Frame],
         "mingw_set_invalid_parameter_handler",
     ];
 
-    // All the frames after these symbols will be removed.
-    // See `rt.rs` and `libtest` for their generation.
-    static BAD_PREFIXES_BOTTOM: &'static [&'static str] = &[
-        "__rust_begin_backtrace_binary",
-        "__rust_begin_backtrace_test",
-    ];
-
     let is_good_frame = |frame: Frame, bad_prefixes: &[&str]| {
         resolve_symname(frame, |symname| {
             if let Some(mangled_symbol_name) = symname {
@@ -154,7 +147,8 @@ fn filter_frames(frames: &[Frame],
         let mut is_marker = false;
         let _ = resolve_symname(*frame, |symname| {
             if let Some(mangled_symbol_name) = symname {
-                if BAD_PREFIXES_BOTTOM.iter().any(|s| mangled_symbol_name.contains(s)) {
+                // Use grep to find the concerned functions
+                if mangled_symbol_name.contains("__rust_begin_short_backtrace_") {
                     is_marker = true;
                 }
             }

src/libtest/lib.rs

@@ -1365,24 +1365,22 @@ pub fn run_test(opts: &TestOpts,
         }
         DynTestFn(f) =>
             run_test_inner(desc, monitor_ch, opts.nocapture,
-                           Box::new(move |()| __rust_begin_backtrace_test_boxfn(f))),
+                           Box::new(move |()| __rust_begin_short_backtrace_test_boxfn(f))),
         StaticTestFn(f) =>
             run_test_inner(desc, monitor_ch, opts.nocapture,
-                           Box::new(move |()| __rust_begin_backtrace_test(f))),
+                           Box::new(move |()| __rust_begin_short_backtrace_test(f))),
     }
 }
 
 /// Fixed frame used to clean the backtrace with `RUST_BACKTRACE=1`.
-#[no_mangle]
 #[inline(never)]
-pub fn __rust_begin_backtrace_test_boxfn(f: Box<FnBox<()>>) {
+fn __rust_begin_short_backtrace_test_boxfn(f: Box<FnBox<()>>) {
     f.call_box(())
 }
 
 /// Fixed frame used to clean the backtrace with `RUST_BACKTRACE=1`.
-#[no_mangle]
 #[inline(never)]
-pub fn __rust_begin_backtrace_test(f: fn()) {
+fn __rust_begin_short_backtrace_test(f: fn()) {
     f()
 }