Skip to content

Commit 0c872f9

Browse files
committed
---
yaml --- r: 37362 b: refs/heads/try c: a469a35 h: refs/heads/master v: v3
1 parent c70b0a5 commit 0c872f9

File tree

2 files changed

+1
-36
lines changed

2 files changed

+1
-36
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 19dae8dae156e190ea1a4c0ca43c012dec14d39f
5+
refs/heads/try: a469a3524d6f59255dd4482eb966fb4a9ec99b54
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/rt/rust_upcall.cpp

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -342,41 +342,6 @@ upcall_str_new(const char *cstr, size_t len) {
342342
return args.retval;
343343
}
344344

345-
346-
347-
struct s_str_new_shared_args {
348-
rust_task *task;
349-
const char *cstr;
350-
size_t len;
351-
rust_opaque_box *retval;
352-
};
353-
354-
extern "C" CDECL void
355-
upcall_s_str_new_shared(s_str_new_shared_args *args) {
356-
rust_task *task = args->task;
357-
LOG_UPCALL_ENTRY(task);
358-
359-
size_t str_fill = args->len + 1;
360-
size_t str_alloc = str_fill;
361-
args->retval = (rust_opaque_box *)
362-
task->boxed.malloc(&str_body_tydesc,
363-
str_fill + sizeof(rust_vec));
364-
rust_str *str = (rust_str *)args->retval;
365-
str->body.fill = str_fill;
366-
str->body.alloc = str_alloc;
367-
memcpy(&str->body.data, args->cstr, args->len);
368-
str->body.data[args->len] = '\0';
369-
}
370-
371-
extern "C" CDECL rust_opaque_box*
372-
upcall_str_new_shared(const char *cstr, size_t len) {
373-
rust_task *task = rust_get_current_task();
374-
s_str_new_shared_args args = { task, cstr, len, 0 };
375-
UPCALL_SWITCH_STACK(task, &args, upcall_s_str_new_shared);
376-
return args.retval;
377-
}
378-
379-
380345
extern "C" _Unwind_Reason_Code
381346
__gxx_personality_v0(int version,
382347
_Unwind_Action actions,

0 commit comments

Comments
 (0)