Skip to content

Commit 0026bd0

Browse files
committed
---
yaml --- r: 3776 b: refs/heads/master c: 7efb942 h: refs/heads/master v: v3
1 parent e6b9cca commit 0026bd0

File tree

3 files changed

+1
-43
lines changed

3 files changed

+1
-43
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: 0babfd9f98a984b485c0d19344987d3db52f9fdb
2+
refs/heads/master: 7efb9426394ce5854b906bd3d7394bfc2228a9d0

trunk/src/rt/rust_upcall.cpp

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -557,46 +557,6 @@ upcall_start_task(rust_task *spawner,
557557
return task;
558558
}
559559

560-
/**
561-
* Resizes an interior vector that has been spilled to the heap.
562-
*/
563-
extern "C" CDECL void
564-
upcall_ivec_resize(rust_task *task,
565-
rust_ivec *v,
566-
size_t newsz) {
567-
LOG_UPCALL_ENTRY(task);
568-
569-
I(task->sched, !v->fill);
570-
571-
size_t new_alloc = next_power_of_two(newsz);
572-
rust_ivec_heap *new_heap_part = (rust_ivec_heap *)
573-
task->realloc(v->payload.ptr, new_alloc + sizeof(size_t));
574-
575-
new_heap_part->fill = newsz;
576-
v->alloc = new_alloc;
577-
v->payload.ptr = new_heap_part;
578-
}
579-
580-
/**
581-
* Spills an interior vector to the heap.
582-
*/
583-
extern "C" CDECL void
584-
upcall_ivec_spill(rust_task *task,
585-
rust_ivec *v,
586-
size_t newsz) {
587-
LOG_UPCALL_ENTRY(task);
588-
size_t new_alloc = next_power_of_two(newsz);
589-
590-
rust_ivec_heap *heap_part = (rust_ivec_heap *)
591-
task->malloc(new_alloc + sizeof(size_t));
592-
heap_part->fill = newsz;
593-
memcpy(&heap_part->data, v->payload.data, v->fill);
594-
595-
v->fill = 0;
596-
v->alloc = new_alloc;
597-
v->payload.ptr = heap_part;
598-
}
599-
600560
/**
601561
* Resizes an interior vector that has been spilled to the heap.
602562
*/

trunk/src/rt/rustrt.def.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ upcall_flush_chan
6161
upcall_free
6262
upcall_get_type_desc
6363
upcall_grow_task
64-
upcall_ivec_resize
6564
upcall_ivec_resize_shared
66-
upcall_ivec_spill
6765
upcall_ivec_spill_shared
6866
upcall_kill
6967
upcall_log_double

0 commit comments

Comments
 (0)