Skip to content

Commit c0f124a

Browse files
author
Elliott Slaughter
committed
---
yaml --- r: 23631 b: refs/heads/master c: f8323ac h: refs/heads/master i: 23629: 031b193 23627: e1af892 23623: e01d2f4 23615: f9be601 v: v3
1 parent d962c85 commit c0f124a

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: dbf6abf6bfd0bf2ac17c648d5e2c1edb68099e60
2+
refs/heads/master: f8323ac6156fd3234a94351a4104a1203bd83df1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rt/rust_box_annihilator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "rust_globals.h"
33
#include "rust_task.h"
44
#include "rust_shape.h"
5+
#include "rust_box_annihilator.h"
56

67
class annihilator : public shape::data<annihilator,shape::ptr> {
78
friend class shape::data<annihilator,shape::ptr>;

trunk/src/rt/rust_box_annihilator.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef RUST_BOX_ANNIHILATOR_H
2+
#define RUST_BOX_ANNIHILATOR_H
3+
4+
#include "rust_task.h"
5+
6+
void
7+
annihilate_box(rust_task *task, rust_opaque_box *box);
8+
9+
void
10+
annihilate_boxes(rust_task *task);
11+
12+
#endif

trunk/src/rt/rust_builtin.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "sync/timer.h"
88
#include "rust_abi.h"
99
#include "rust_port.h"
10+
#include "rust_box_annihilator.h"
1011

1112
#include <time.h>
1213

@@ -740,6 +741,12 @@ rust_set_exit_status(intptr_t code) {
740741
task->kernel->set_exit_status((int)code);
741742
}
742743

744+
extern "C" CDECL void
745+
rust_annihilate_box(rust_opaque_box *ptr) {
746+
rust_task *task = rust_get_current_task();
747+
annihilate_box(task, ptr);
748+
}
749+
743750
extern void log_console_on();
744751

745752
extern "C" CDECL void

0 commit comments

Comments
 (0)