Skip to content

Commit b65beea

Browse files
RalfJungRalfJung
committed
use a single large catch_unwind in lang_start
1 parent 8f89773 commit b65beea

File tree

4 files changed

+34
-10
lines changed

4 files changed

+34
-10
lines changed

‎tests/fail/tail_calls/cc-mismatch.stderr

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ LL | extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
1515
= note: inside `std::panicking::r#try::<i32, &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>` at RUSTLIB/std/src/panicking.rs:LL:CC
1616
= note: inside `std::panic::catch_unwind::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32>` at RUSTLIB/std/src/panic.rs:LL:CC
1717
= note: inside closure at RUSTLIB/std/src/rt.rs:LL:CC
18-
= note: inside `std::panicking::r#try::do_call::<{closure@std::rt::lang_start_internal::{closure#1}}, isize>` at RUSTLIB/std/src/panicking.rs:LL:CC
19-
= note: inside `std::panicking::r#try::<isize, {closure@std::rt::lang_start_internal::{closure#1}}>` at RUSTLIB/std/src/panicking.rs:LL:CC
20-
= note: inside `std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#1}}, isize>` at RUSTLIB/std/src/panic.rs:LL:CC
18+
= note: inside `std::panicking::r#try::do_call::<{closure@std::rt::lang_start_internal::{closure#0}::{closure#0}}, isize>` at RUSTLIB/std/src/panicking.rs:LL:CC
19+
= note: inside `std::panicking::r#try::<isize, {closure@std::rt::lang_start_internal::{closure#0}::{closure#0}}>` at RUSTLIB/std/src/panicking.rs:LL:CC
20+
= note: inside `std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#0}::{closure#0}}, isize>` at RUSTLIB/std/src/panic.rs:LL:CC
21+
= note: inside closure at RUSTLIB/std/src/rt.rs:LL:CC
22+
= note: inside `std::panicking::r#try::do_call::<{closure@std::rt::lang_start_internal::{closure#0}}, std::result::Result<isize, !>>` at RUSTLIB/std/src/panicking.rs:LL:CC
23+
= note: inside `std::panicking::r#try::<std::result::Result<isize, !>, {closure@std::rt::lang_start_internal::{closure#0}}>` at RUSTLIB/std/src/panicking.rs:LL:CC
24+
= note: inside `std::panic::catch_unwind::<{closure@std::rt::lang_start_internal::{closure#0}}, std::result::Result<isize, !>>` at RUSTLIB/std/src/panic.rs:LL:CC
2125
= note: inside `std::rt::lang_start_internal` at RUSTLIB/std/src/rt.rs:LL:CC
2226
= note: inside `std::rt::lang_start::<()>` at RUSTLIB/std/src/rt.rs:LL:CC
2327

‎tests/pass/backtrace/backtrace-api-v1.stderr

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ RUSTLIB/core/src/ops/function.rs:LL:CC (std::ops::function::impls::call_once)
1010
RUSTLIB/std/src/panicking.rs:LL:CC (std::panicking::r#try::do_call)
1111
RUSTLIB/std/src/panicking.rs:LL:CC (std::panicking::r#try)
1212
RUSTLIB/std/src/panic.rs:LL:CC (std::panic::catch_unwind)
13-
RUSTLIB/std/src/rt.rs:LL:CC (std::rt::lang_start_internal::{closure#1})
13+
RUSTLIB/std/src/rt.rs:LL:CC (std::rt::lang_start_internal::{closure#0}::{closure#0})
14+
RUSTLIB/std/src/panicking.rs:LL:CC (std::panicking::r#try::do_call)
15+
RUSTLIB/std/src/panicking.rs:LL:CC (std::panicking::r#try)
16+
RUSTLIB/std/src/panic.rs:LL:CC (std::panic::catch_unwind)
17+
RUSTLIB/std/src/rt.rs:LL:CC (std::rt::lang_start_internal::{closure#0})
1418
RUSTLIB/std/src/panicking.rs:LL:CC (std::panicking::r#try::do_call)
1519
RUSTLIB/std/src/panicking.rs:LL:CC (std::panicking::r#try)
1620
RUSTLIB/std/src/panic.rs:LL:CC (std::panic::catch_unwind)

‎tests/pass/backtrace/backtrace-global-alloc.stderr

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,23 @@
1414
at RUSTLIB/std/src/panicking.rs:LL:CC
1515
7: std::panic::catch_unwind
1616
at RUSTLIB/std/src/panic.rs:LL:CC
17-
8: std::rt::lang_start_internal::{closure#1}
17+
8: std::rt::lang_start_internal::{closure#0}::{closure#0}
1818
at RUSTLIB/std/src/rt.rs:LL:CC
1919
9: std::panicking::r#try::do_call
2020
at RUSTLIB/std/src/panicking.rs:LL:CC
2121
10: std::panicking::r#try
2222
at RUSTLIB/std/src/panicking.rs:LL:CC
2323
11: std::panic::catch_unwind
2424
at RUSTLIB/std/src/panic.rs:LL:CC
25-
12: std::rt::lang_start_internal
25+
12: std::rt::lang_start_internal::{closure#0}
2626
at RUSTLIB/std/src/rt.rs:LL:CC
27-
13: std::rt::lang_start
27+
13: std::panicking::r#try::do_call
28+
at RUSTLIB/std/src/panicking.rs:LL:CC
29+
14: std::panicking::r#try
30+
at RUSTLIB/std/src/panicking.rs:LL:CC
31+
15: std::panic::catch_unwind
32+
at RUSTLIB/std/src/panic.rs:LL:CC
33+
16: std::rt::lang_start_internal
34+
at RUSTLIB/std/src/rt.rs:LL:CC
35+
17: std::rt::lang_start
2836
at RUSTLIB/std/src/rt.rs:LL:CC

‎tests/pass/backtrace/backtrace-std.stderr

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,23 @@
2222
at RUSTLIB/std/src/panicking.rs:LL:CC
2323
11: std::panic::catch_unwind
2424
at RUSTLIB/std/src/panic.rs:LL:CC
25-
12: std::rt::lang_start_internal::{closure#1}
25+
12: std::rt::lang_start_internal::{closure#0}::{closure#0}
2626
at RUSTLIB/std/src/rt.rs:LL:CC
2727
13: std::panicking::r#try::do_call
2828
at RUSTLIB/std/src/panicking.rs:LL:CC
2929
14: std::panicking::r#try
3030
at RUSTLIB/std/src/panicking.rs:LL:CC
3131
15: std::panic::catch_unwind
3232
at RUSTLIB/std/src/panic.rs:LL:CC
33-
16: std::rt::lang_start_internal
33+
16: std::rt::lang_start_internal::{closure#0}
3434
at RUSTLIB/std/src/rt.rs:LL:CC
35-
17: std::rt::lang_start
35+
17: std::panicking::r#try::do_call
36+
at RUSTLIB/std/src/panicking.rs:LL:CC
37+
18: std::panicking::r#try
38+
at RUSTLIB/std/src/panicking.rs:LL:CC
39+
19: std::panic::catch_unwind
40+
at RUSTLIB/std/src/panic.rs:LL:CC
41+
20: std::rt::lang_start_internal
42+
at RUSTLIB/std/src/rt.rs:LL:CC
43+
21: std::rt::lang_start
3644
at RUSTLIB/std/src/rt.rs:LL:CC

0 commit comments

Comments
 (0)