nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 22:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename core::rt_fail to core::rt_fail_

Browse Source
This commit is contained in:
Brian Anderson 2012-09-12 11:51:44 -07:00
parent 86e02554fd
commit 8fbe4b5841
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcore/rt.rs
View File

@ -39,6 +39,12 @@ fn rt_fail(expr: *c_char, file: *c_char, line: size_t) {
rustrt::rust_upcall_fail(expr, file, line); rustrt::rust_upcall_fail(expr, file, line);
} }
#[rt(fail_)]
fn rt_fail_(expr: *c_char, file: *c_char, line: size_t) {
cleanup_stack_for_failure();
rustrt::rust_upcall_fail(expr, file, line);
}
#[rt(exchange_malloc)] #[rt(exchange_malloc)]
fn rt_exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char { fn rt_exchange_malloc(td: *c_char, size: uintptr_t) -> *c_char {
return rustrt::rust_upcall_exchange_malloc(td, size); return rustrt::rust_upcall_exchange_malloc(td, size);

2
src/rustc/middle/trans/base.rs
View File

@ -2403,7 +2403,7 @@ fn gather_rtcalls(ccx: @crate_ctxt, crate: @ast::crate) {
// in some obscure place in LLVM if the user provides the wrong signature // in some obscure place in LLVM if the user provides the wrong signature
// for an rtcall. // for an rtcall.
let expected_rtcalls = let expected_rtcalls =
~[~"exchange_free", ~"exchange_malloc", ~"fail", ~"free", ~"malloc"]; ~[~"exchange_free", ~"exchange_malloc", ~"fail_", ~"free", ~"malloc"];
for vec::each(expected_rtcalls) |name| { for vec::each(expected_rtcalls) |name| {
if !ccx.rtcalls.contains_key(name) { if !ccx.rtcalls.contains_key(name) {
fail fmt!("no definition for runtime call %s", name); fail fmt!("no definition for runtime call %s", name);