Skip to content

Commit c178ef5

Browse files
committed
librustc: Make &fn by-copy by default and remove the mode from frame_address.
1 parent 6605cde commit c178ef5

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

src/libcore/stackwalk.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ pub mod rustrt {
9393
pub mod rusti {
9494
#[abi = "rust-intrinsic"]
9595
pub extern "rust-intrinsic" {
96+
#[cfg(stage0)]
9697
pub fn frame_address(f: &once fn(x: *u8));
98+
#[cfg(not(stage0))]
99+
pub fn frame_address(+f: &once fn(x: *u8));
97100
}
98101
}
99102

src/librustc/middle/ty.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,14 +1267,6 @@ pub fn mach_sty(cfg: @session::config, t: t) -> sty {
12671267
}
12681268

12691269
pub fn default_arg_mode_for_ty(tcx: ctxt, ty: ty::t) -> ast::rmode {
1270-
// FIXME(#2202) --- We retain by-ref for &fn things to workaround a
1271-
// memory leak that otherwise results when @fn is upcast to &fn.
1272-
match ty::get(ty).sty {
1273-
ty::ty_closure(ClosureTy {sigil: ast::BorrowedSigil, _}) => {
1274-
return ast::by_ref;
1275-
}
1276-
_ => {}
1277-
}
12781270
return if tcx.legacy_modes {
12791271
if type_is_borrowed(ty) {
12801272
// the old mode default was ++ for things like &ptr, but to be

src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3502,7 +3502,7 @@ pub fn check_intrinsic_type(ccx: @mut CrateCtxt, it: @ast::foreign_item) {
35023502
output: ty::mk_nil()
35033503
}
35043504
});
3505-
(0u, ~[arg(ast::by_ref, fty)], ty::mk_nil())
3505+
(0u, ~[arg(ast::by_copy, fty)], ty::mk_nil())
35063506
}
35073507
~"morestack_addr" => {
35083508
(0u, ~[], ty::mk_nil_ptr(ccx.tcx))

0 commit comments

Comments
 (0)