---

yaml
---
r: 22938
b: refs/heads/master
c: c076d3c
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 16a0f72f8ca85b1e2a1b69043dc16c6cf20cc83f
+refs/heads/master: c076d3ccc0a0cfc9dc61c4a3cac9ae358781f7d5
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/trans/base.rs

@@ -3452,7 +3452,17 @@ fn trans_struct(block_context: block, span: span, fields: ~[ast::field],
             }
         }
 
-        let dest = GEPi(block_context, dest_address, ~[0, index]);
+        // If the class has a destructor, our GEP is a little more
+        // complicated.
+        let dest;
+        if ty::ty_dtor(block_context.tcx(), class_id).is_some() {
+            dest = GEPi(block_context,
+                        GEPi(block_context, dest_address, ~[0, 1]),
+                        ~[0, index]);
+        } else {
+            dest = GEPi(block_context, dest_address, ~[0, index]);
+        }
+
         block_context = trans_expr_save_in(block_context,
                                            field.node.expr,
                                            dest);