---

yaml
---
r: 31600
b: refs/heads/dist-snap
c: c076d3c
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 16a0f72f8ca85b1e2a1b69043dc16c6cf20cc83f
+refs/heads/dist-snap: c076d3ccc0a0cfc9dc61c4a3cac9ae358781f7d5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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);