diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-22 00:06:29 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-07-22 01:09:48 -0400 |
| commit | ed67cdb73c9cf3a1cba768b3122aa03564b43ccc (patch) | |
| tree | b7676278f04d251c9d0a3132d489ecc7f650cef8 /src/libstd/gc.rs | |
| parent | fc058191818e4440d36e5ed4ef61bc0a9711be11 (diff) | |
| download | rust-ed67cdb73c9cf3a1cba768b3122aa03564b43ccc.tar.gz rust-ed67cdb73c9cf3a1cba768b3122aa03564b43ccc.zip | |
new snapshot
Diffstat (limited to 'src/libstd/gc.rs')
| -rw-r--r-- | src/libstd/gc.rs | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/libstd/gc.rs b/src/libstd/gc.rs index 62be923d770..911fb5625e5 100644 --- a/src/libstd/gc.rs +++ b/src/libstd/gc.rs @@ -317,19 +317,6 @@ fn expect_sentinel() -> bool { true } #[cfg(nogc)] fn expect_sentinel() -> bool { false } -#[inline] -#[cfg(not(stage0))] -unsafe fn call_drop_glue(tydesc: *TyDesc, data: *i8) { - // This function should be inlined when stage0 is gone - ((*tydesc).drop_glue)(data); -} - -#[inline] -#[cfg(stage0)] -unsafe fn call_drop_glue(tydesc: *TyDesc, data: *i8) { - ((*tydesc).drop_glue)(0 as **TyDesc, data); -} - // Entry point for GC-based cleanup. Walks stack looking for exchange // heap and stack allocations requiring drop, and runs all // destructors. @@ -373,7 +360,7 @@ pub fn cleanup_stack_for_failure() { // FIXME #4420: Destroy this box // FIXME #4330: Destroy this box } else { - call_drop_glue(tydesc, *root as *i8); + ((*tydesc).drop_glue)(*root as *i8); } } } |
