Skip to content

Commit 47db279

Browse files
committed
---
yaml --- r: 5396 b: refs/heads/master c: 3079577 h: refs/heads/master v: v3
1 parent 239caa9 commit 47db279

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 45086b7bfd3ae6f97e28f215b58d1f19def09c4d
2+
refs/heads/master: 307957710c69f41519f5f22997c629fc5e077771

trunk/src/rt/rust_task.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ rust_task::rust_task(rust_scheduler *sched, rust_task_list *state,
5757
ref_count(1),
5858
stk(NULL),
5959
runtime_sp(0),
60-
gc_alloc_chain(0),
6160
sched(sched),
6261
cache(NULL),
6362
kernel(sched->kernel),

trunk/src/rt/rust_task.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
5959
context ctx;
6060
stk_seg *stk;
6161
uintptr_t runtime_sp; // Runtime sp while task running.
62-
rust_box *gc_alloc_chain; // Linked list of GC allocations.
6362
rust_scheduler *sched;
6463
rust_crate_cache *cache;
6564

trunk/src/rt/rust_upcall.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ upcall_malloc(rust_task *task, size_t nbytes, type_desc *td) {
5757
LOG_UPCALL_ENTRY(task);
5858

5959
LOG(task, mem,
60-
"upcall malloc(%" PRIdPTR ", 0x%" PRIxPTR ")"
61-
" with gc-chain head = 0x%" PRIxPTR,
62-
nbytes, td, task->gc_alloc_chain);
60+
"upcall malloc(%" PRIdPTR ", 0x%" PRIxPTR ")",
61+
nbytes, td);
6362

6463
gc::maybe_gc(task);
6564

@@ -69,10 +68,8 @@ upcall_malloc(rust_task *task, size_t nbytes, type_desc *td) {
6968
void *p = task->malloc(nbytes, "tdesc", td);
7069

7170
LOG(task, mem,
72-
"upcall malloc(%" PRIdPTR ", 0x%" PRIxPTR
73-
") = 0x%" PRIxPTR
74-
" with gc-chain head = 0x%" PRIxPTR,
75-
nbytes, td, (uintptr_t)p, task->gc_alloc_chain);
71+
"upcall malloc(%" PRIdPTR ", 0x%" PRIxPTR ") = 0x%" PRIxPTR,
72+
nbytes, td, (uintptr_t)p);
7673
return (uintptr_t) p;
7774
}
7875

0 commit comments

Comments
 (0)