Skip to content

Commit 457683c

Browse files
committed
Do not pass taskpointers to "rust" native functions
Issue #466
1 parent 6323a01 commit 457683c

9 files changed

+67
-93
lines changed

src/comp/middle/trans.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5762,7 +5762,7 @@ fn register_native_fn(ccx: @crate_ctxt, sp: span, path: [str], name: str,
57625762
let cast_to_i32;
57635763
alt abi {
57645764
ast::native_abi_rust. {
5765-
pass_task = true;
5765+
pass_task = false;
57665766
uses_retptr = false;
57675767
cast_to_i32 = true;
57685768
}

src/lib/run_program.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ fn program_output(prog: str, args: [str]) ->
114114
{status: int, out: str, err: str} {
115115
let pr = start_program(prog, args);
116116
pr.close_input();
117-
ret {status: pr.finish(),
118-
out: read_all(pr.output()),
119-
err: read_all(pr.err())};
117+
let out = read_all(pr.output());
118+
let err = read_all(pr.err());
119+
ret {status: pr.finish(), out: out, err: err};
120120
}
121121

122122
/* Returns an exit status */

src/lib/task.rs

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ native "rust" mod rustrt {
3838
fn new_task() -> task_id;
3939
fn drop_task(task: *rust_task);
4040
fn get_task_pointer(id: task_id) -> *rust_task;
41-
fn get_task_trampoline() -> u32;
4241

4342
fn migrate_alloc(alloc: *u8, target: task_id);
4443
fn start_task(id: task_id, closure: *u8);

0 commit comments

Comments
 (0)