diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-22 01:09:06 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-06-24 17:07:03 -0700 |
| commit | 5e7c5d6c3d532e7b536b76044cd47b72b8eadaad (patch) | |
| tree | 4293df31a4276cc3d477ece661fe30debc7da63a /src/rt | |
| parent | a09972db3545344048b90e90d1f1821b621a38b9 (diff) | |
| download | rust-5e7c5d6c3d532e7b536b76044cd47b72b8eadaad.tar.gz rust-5e7c5d6c3d532e7b536b76044cd47b72b8eadaad.zip | |
std: Make box annihilator work with newsched
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_builtin.cpp | 6 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index 9ed389b178a..51e2849eb54 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -883,6 +883,12 @@ rust_delete_memory_region(memory_region *region) { } extern "C" CDECL boxed_region* +rust_current_boxed_region() { + rust_task *task = rust_get_current_task(); + return &task->boxed; +} + +extern "C" CDECL boxed_region* rust_new_boxed_region(memory_region *region, uintptr_t poison_on_free) { return new boxed_region(region, poison_on_free); diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 9add8d537af..d85700435e0 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -244,4 +244,5 @@ rust_drop_env_lock rust_update_log_settings rust_running_on_valgrind rust_get_num_cpus -rust_get_global_args_ptr \ No newline at end of file +rust_get_global_args_ptr +rust_current_boxed_region \ No newline at end of file |