nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-24 12:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove DropValue.is_immediate

Browse Source
This commit is contained in:
Mark-Simulacrum 2016-12-12 12:32:16 -07:00 committed by Mark Simulacrum
parent ec518a0069
commit 2842912583
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustc_trans/cleanup.rs
View File

@ -182,7 +182,6 @@ impl<'blk, 'tcx> FunctionContext<'blk, 'tcx> {
ty: Ty<'tcx>) {
if !self.type_needs_drop(ty) { return; }
let drop = DropValue {
is_immediate: false,
val: val,
ty: ty,
skip_dtor: false,
@ -211,7 +210,6 @@ impl<'blk, 'tcx> FunctionContext<'blk, 'tcx> {
if !self.type_needs_drop(ty) { return; }
let drop = DropValue {
is_immediate: false,
val: val,
ty: ty,
skip_dtor: true,
@ -593,7 +591,6 @@ impl PartialEq for UnwindKind {
#[derive(Copy, Clone)]
pub struct DropValue<'tcx> {
is_immediate: bool,
val: ValueRef,
ty: Ty<'tcx>,
skip_dtor: bool,
@ -605,15 +602,6 @@ impl<'tcx> DropValue<'tcx> {
funclet: Option<&'blk Funclet>,
bcx: BlockAndBuilder<'blk, 'tcx>,
) -> BlockAndBuilder<'blk, 'tcx> {
if self.is_immediate {
let vp = base::alloc_ty(&bcx, self.ty, "");
Lifetime::Start.call(&bcx, vp);
base::store_ty(&bcx, self.val, vp, self.ty);
let bcx = glue::call_drop_glue(bcx, vp, self.ty, self.skip_dtor, funclet);
Lifetime::End.call(&bcx, vp);
bcx
} else {
glue::call_drop_glue(bcx, self.val, self.ty, self.skip_dtor, funclet)
}
glue::call_drop_glue(bcx, self.val, self.ty, self.skip_dtor, funclet)
}
}