Skip to content

Commit 8eb3e38

Browse files
committed
librustc: Remove calls to upcall_reset_stack_limit
1 parent 7e77bf1 commit 8eb3e38

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

src/librustc/back/upcall.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,13 @@ use lib::llvm::{ModuleRef, ValueRef};
1717
pub struct Upcalls {
1818
trace: ValueRef,
1919
rust_personality: ValueRef,
20-
reset_stack_limit: ValueRef
2120
}
2221

2322
macro_rules! upcall (
2423
(fn $name:ident($($arg:expr),+) -> $ret:expr) => ({
2524
let fn_ty = Type::func([ $($arg),* ], &$ret);
2625
base::decl_cdecl_fn(llmod, ~"upcall_" + stringify!($name), fn_ty)
2726
});
28-
(nothrow fn $name:ident($($arg:expr),+) -> $ret:expr) => ({
29-
let fn_ty = Type::func([ $($arg),* ], &$ret);
30-
let decl = base::decl_cdecl_fn(llmod, ~"upcall_" + stringify!($name), fn_ty);
31-
base::set_no_unwind(decl);
32-
decl
33-
});
3427
(nothrow fn $name:ident -> $ret:expr) => ({
3528
let fn_ty = Type::func([], &$ret);
3629
let decl = base::decl_cdecl_fn(llmod, ~"upcall_" + stringify!($name), fn_ty);
@@ -46,6 +39,5 @@ pub fn declare_upcalls(targ_cfg: @session::config, llmod: ModuleRef) -> @Upcalls
4639
@Upcalls {
4740
trace: upcall!(fn trace(opaque_ptr, opaque_ptr, int_ty) -> Type::void()),
4841
rust_personality: upcall!(nothrow fn rust_personality -> Type::i32()),
49-
reset_stack_limit: upcall!(nothrow fn reset_stack_limit -> Type::void())
5042
}
5143
}

src/librustc/middle/trans/base.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,11 +1012,6 @@ pub fn get_landing_pad(bcx: @mut Block) -> BasicBlockRef {
10121012
// The landing pad block is a cleanup
10131013
SetCleanup(pad_bcx, llretval);
10141014

1015-
// Because we may have unwound across a stack boundary, we must call into
1016-
// the runtime to figure out which stack segment we are on and place the
1017-
// stack limit back into the TLS.
1018-
Call(pad_bcx, bcx.ccx().upcalls.reset_stack_limit, [], []);
1019-
10201015
// We store the retval in a function-central alloca, so that calls to
10211016
// Resume can find it.
10221017
match bcx.fcx.personality {

0 commit comments

Comments
 (0)