---

yaml
---
r: 45034
b: refs/heads/master
c: b6bcf1a
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 71b6e945c11a3a0f44e5e45bcad4e7bddf35ba8a
+refs/heads/master: b6bcf1a81f14223b9108c724794d388db1233905
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/middle/trans/adt.rs

@@ -266,6 +266,14 @@ fn struct_GEP(bcx: block, st: &Struct, val: ValueRef, ix: uint,
     GEPi(bcx, val, [0, ix])
 }
 
+pub fn trans_drop_flag_ptr(bcx: block, r: &Repr, val: ValueRef) -> ValueRef {
+    match *r {
+        Univariant(_, DtorPresent) => GEPi(bcx, val, [0, 1]),
+        _ => bcx.ccx().sess.bug(~"tried to get drop flag of non-droppable \
+                                  type")
+    }
+}
+
 pub fn trans_const(ccx: @CrateContext, r: &Repr, discr: int,
                    vals: &[ValueRef]) -> ValueRef {
     match *r {

trunk/src/librustc/middle/trans/glue.rs

@@ -468,7 +468,8 @@ pub fn trans_struct_drop(bcx: block,
                          substs: &ty::substs,
                          take_ref: bool)
                       -> block {
-    let drop_flag = GEPi(bcx, v0, struct_dtor());
+    let repr = adt::represent_type(bcx.ccx(), t);
+    let drop_flag = adt::trans_drop_flag_ptr(bcx, &repr, v0);
     do with_cond(bcx, IsNotNull(bcx, Load(bcx, drop_flag))) |cx| {
         let mut bcx = cx;
 
@@ -502,7 +503,6 @@ pub fn trans_struct_drop(bcx: block,
         Call(bcx, dtor_addr, args);
 
         // Drop the fields
-        let repr = adt::represent_type(bcx.ccx(), t);
         let field_tys =
             ty::struct_mutable_fields(bcx.tcx(), class_did,
                                               substs);