Skip to content

Commit a2a0aaa

Browse files
committed
---
yaml --- r: 5551 b: refs/heads/master c: a88d9ef h: refs/heads/master i: 5549: 558e6e9 5547: 02551be 5543: c060b7b 5535: c7aa08f v: v3
1 parent 67e8dc4 commit a2a0aaa

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
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: 5c973142df3661a23a085bfb655300c08ca19764
2+
refs/heads/master: a88d9effbca3a228136dff82b4d47a8bf8276b64

trunk/src/rt/rust_cc.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,16 +419,9 @@ sweep(rust_task *task, const std::set<void *> &marked) {
419419
while (begin != end) {
420420
void *alloc = begin->first;
421421
if (marked.find(alloc) == marked.end()) {
422-
const type_desc *tydesc = begin->second;
423-
424422
//DPRINT("object is part of a cycle: %p\n", alloc);
425423

426-
// Run the destructor.
427-
// TODO: What if it fails?
428-
if (tydesc->drop_glue) {
429-
tydesc->drop_glue(NULL, task, (void *)tydesc,
430-
tydesc->first_param, alloc);
431-
}
424+
// FIXME: Run the destructor, *if* it's a resource.
432425

433426
task->free(alloc);
434427
}

0 commit comments

Comments
 (0)