forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix incorrect finalizer registration
This fixes a bug in finalizer registration in Alloy were the wrong pointer was being passed to Boehm. A pointer to underlying `GcBox` should be passed instead of the `Gc` smart pointer.
- Loading branch information
1 parent
48391ba
commit fafbab3
Showing
2 changed files
with
36 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// run-pass | ||
// ignore-tidy-linelength | ||
#![feature(gc)] | ||
#![feature(rustc_private)] | ||
|
||
use std::gc::{Gc, GcAllocator}; | ||
use std::sync::atomic::{self, AtomicUsize}; | ||
|
||
struct Finalizable(usize); | ||
|
||
impl Drop for Finalizable { | ||
fn drop(&mut self) { | ||
FINALIZER_COUNT.fetch_add(1, atomic::Ordering::Relaxed); | ||
} | ||
} | ||
|
||
static FINALIZER_COUNT: AtomicUsize = AtomicUsize::new(0); | ||
static ALLOCATED_COUNT: usize = 100; | ||
|
||
fn foo() { | ||
for i in 0..ALLOCATED_COUNT { | ||
{ | ||
let mut _gc = Some(Gc::new(Finalizable(i))); | ||
|
||
// Zero the root to the GC object. | ||
_gc = None; | ||
} | ||
} | ||
} | ||
|
||
fn main() { | ||
foo(); | ||
GcAllocator::force_gc(); | ||
assert_eq!(FINALIZER_COUNT.load(atomic::Ordering::Relaxed), ALLOCATED_COUNT); | ||
} |