diff options
| author | Marijn Haverbeke <marijnh@gmail.com> | 2011-10-20 11:56:45 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2011-10-20 14:22:17 +0200 |
| commit | 8124846b2c945f661a6bb85e66e22ca987891dc4 (patch) | |
| tree | a299fea71192b2716e063a7098e5c6b6850967bb /src/rt/rust_task.cpp | |
| parent | 457683c7feef42f07f3044ccfdc8ee7816176ab0 (diff) | |
| download | rust-8124846b2c945f661a6bb85e66e22ca987891dc4.tar.gz rust-8124846b2c945f661a6bb85e66e22ca987891dc4.zip | |
Get rid of taskpointer-passing throughout the compiler
Only intrinsics still take a dummy taskptr. We'll have to do some makefile stunts to snapshot a version without taskptrs-in-intrinsics. Issue #466
Diffstat (limited to 'src/rt/rust_task.cpp')
| -rw-r--r-- | src/rt/rust_task.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index a764856343b..17faeec1a1c 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -130,8 +130,7 @@ struct spawn_args { rust_task *task; uintptr_t a3; uintptr_t a4; - void (*CDECL f)(int *, rust_task *, - uintptr_t, uintptr_t); + void (*CDECL f)(int *, uintptr_t, uintptr_t); }; struct rust_closure_env { @@ -147,7 +146,7 @@ void task_start_wrapper(spawn_args *a) bool failed = false; try { - a->f(&rval, task, a->a3, a->a4); + a->f(&rval, a->a3, a->a4); } catch (rust_task *ex) { A(task->sched, ex == task, "Expected this task to be thrown for unwinding"); |
