Skip to content

Commit 9aeff31

Browse files
committed
---
yaml --- r: 36083 b: refs/heads/try2 c: 759e1c1 h: refs/heads/master i: 36081: ab30f7a 36079: 4a8a496 v: v3
1 parent abe82dc commit 9aeff31

File tree

3 files changed

+1
-34
lines changed

3 files changed

+1
-34
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8d932160d92137e0a7d556a5ff7cfae4e68d5781
8+
refs/heads/try2: 759e1c165f474314bb113d0b72e8ef85fc3864d7
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/rt/rust_upcall.cpp

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -311,37 +311,6 @@ upcall_validate_box(rust_opaque_box* ptr) {
311311

312312
/**********************************************************************/
313313

314-
struct s_str_new_uniq_args {
315-
rust_task *task;
316-
const char *cstr;
317-
size_t len;
318-
rust_str *retval;
319-
};
320-
321-
extern "C" CDECL void
322-
upcall_s_str_new_uniq(s_str_new_uniq_args *args) {
323-
rust_task *task = args->task;
324-
LOG_UPCALL_ENTRY(task);
325-
args->retval = make_str(task->kernel, args->cstr, args->len,
326-
"str_new_uniq");
327-
}
328-
329-
extern "C" CDECL rust_str*
330-
upcall_str_new_uniq(const char *cstr, size_t len) {
331-
rust_task *task = rust_get_current_task();
332-
s_str_new_uniq_args args = { task, cstr, len, 0 };
333-
UPCALL_SWITCH_STACK(task, &args, upcall_s_str_new_uniq);
334-
return args.retval;
335-
}
336-
337-
extern "C" CDECL rust_str*
338-
upcall_str_new(const char *cstr, size_t len) {
339-
rust_task *task = rust_get_current_task();
340-
s_str_new_uniq_args args = { task, cstr, len, 0 };
341-
UPCALL_SWITCH_STACK(task, &args, upcall_s_str_new_uniq);
342-
return args.retval;
343-
}
344-
345314
extern "C" _Unwind_Reason_Code
346315
__gxx_personality_v0(int version,
347316
_Unwind_Action actions,

branches/try2/src/rt/rustrt.def.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ upcall_validate_box
7979
upcall_log_type
8080
upcall_malloc
8181
upcall_rust_personality
82-
upcall_str_new_uniq
83-
upcall_str_new_shared
8482
upcall_call_shim_on_c_stack
8583
upcall_call_shim_on_rust_stack
8684
upcall_new_stack

0 commit comments

Comments
 (0)