Skip to content

Commit b2a11f9

Browse files
committed
---
yaml --- r: 95234 b: refs/heads/dist-snap c: a9fb88d h: refs/heads/master v: v3
1 parent ab3f627 commit b2a11f9

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 8eb28bb7dcd77ac9e804ab2d75b387ca3f47f9d4
9+
refs/heads/dist-snap: a9fb88d4f8c44daadce81fbd009ff4676a38d5e9
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/glue.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -595,23 +595,6 @@ pub fn make_take_glue(bcx: @mut Block, v: ValueRef, t: ty::t) -> @mut Block {
595595
bcx
596596
}
597597
ty::ty_opaque_closure_ptr(_) => bcx,
598-
ty::ty_struct(did, _) => {
599-
let tcx = bcx.tcx();
600-
let bcx = iter_structural_ty(bcx, v, t, take_ty);
601-
602-
match ty::ty_dtor(tcx, did) {
603-
ty::TraitDtor(_, false) => {
604-
// Zero out the struct
605-
unsafe {
606-
let ty = Type::from_ref(llvm::LLVMTypeOf(v));
607-
memzero(&B(bcx), v, ty);
608-
}
609-
610-
}
611-
_ => { }
612-
}
613-
bcx
614-
}
615598
_ if ty::type_is_structural(t) => {
616599
iter_structural_ty(bcx, v, t, take_ty)
617600
}

0 commit comments

Comments
 (0)