librustc: Implement fast-ffi and use it in various places

1 files changed, 15 insertions, 0 deletions

diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 9f39e1433fc..e524e6de859 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -191,6 +191,14 @@ rust_upcall_malloc(type_desc *td, uintptr_t size) {
     return upcall_malloc(td, size);
 }
 
+extern "C" CDECL uintptr_t
+rust_upcall_malloc_noswitch(type_desc *td, uintptr_t size) {
+    rust_task *task = rust_get_current_task();
+    s_malloc_args args = {task, 0, td, size};
+    upcall_s_malloc(&args);
+    return args.retval;
+}
+
 /**********************************************************************
  * Called whenever an object in the task-local heap is freed.
  */
@@ -231,6 +239,13 @@ rust_upcall_free(void* ptr) {
     upcall_free(ptr);
 }
 
+extern "C" CDECL void
+rust_upcall_free_noswitch(void* ptr) {
+    rust_task *task = rust_get_current_task();
+    s_free_args args = {task,ptr};
+    upcall_s_free(&args);
+}
+
 /**********************************************************************/
 
 extern "C" _Unwind_Reason_Code