Skip to content

Commit 8ebdb1a

Browse files
committed
rt: Remove some unused upcalls
1 parent a50d1fd commit 8ebdb1a

File tree

2 files changed

+0
-37
lines changed

2 files changed

+0
-37
lines changed

src/rt/rust_upcall.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -124,23 +124,6 @@ struct s_trace_args {
124124
size_t line;
125125
};
126126

127-
extern "C" CDECL void
128-
upcall_s_trace(s_trace_args *args) {
129-
rust_task *task = args->task;
130-
LOG_UPCALL_ENTRY(task);
131-
LOG(task, trace, "Trace %s:%d: %s",
132-
args->file, args->line, args->msg);
133-
}
134-
135-
extern "C" CDECL void
136-
upcall_trace(char const *msg,
137-
char const *file,
138-
size_t line) {
139-
rust_task *task = rust_get_current_task();
140-
s_trace_args args = {task,msg,file,line};
141-
UPCALL_SWITCH_STACK(task, &args, upcall_s_trace);
142-
}
143-
144127
/**********************************************************************
145128
* Allocate an object in the exchange heap
146129
*/
@@ -302,17 +285,6 @@ rust_upcall_free(void* ptr) {
302285
upcall_free(ptr);
303286
}
304287

305-
/**********************************************************************
306-
* Sanity checks on boxes, insert when debugging possible
307-
* use-after-free bugs. See maybe_validate_box() in trans.rs.
308-
*/
309-
310-
extern "C" CDECL void
311-
upcall_validate_box(rust_opaque_box* ptr) {
312-
// XXX: Remove after snapshot
313-
abort();
314-
}
315-
316288
/**********************************************************************/
317289

318290
extern "C" _Unwind_Reason_Code
@@ -369,12 +341,6 @@ upcall_rust_personality(int version,
369341
return args.retval;
370342
}
371343

372-
extern "C" void
373-
upcall_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
374-
// XXX: Remove after snapshot
375-
abort();
376-
}
377-
378344
// NB: This needs to be blazing fast. Don't switch stacks
379345
extern "C" CDECL void *
380346
upcall_new_stack(size_t stk_sz, void *args_addr, size_t args_sz) {

src/rt/rustrt.def.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ task_clear_event_reject
6060
task_wait_event
6161
task_signal_event
6262
upcall_fail
63-
upcall_trace
6463
upcall_free
65-
upcall_validate_box
66-
upcall_log_type
6764
upcall_malloc
6865
upcall_rust_personality
6966
upcall_call_shim_on_c_stack

0 commit comments

Comments
 (0)