---

yaml
---
r: 16268
b: refs/heads/try
c: 8972588
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 7daf986aeca81a72be5869a5a41d4fde753eca0f
+refs/heads/try: 8972588583398b207f0f7033b2af20bca509eba7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/trans/base.rs

@@ -2448,19 +2448,7 @@ fn trans_local_var(cx: block, def: ast::def) -> local_var_result {
       }
       ast::def_self(sid) {
         let slf = alt copy cx.fcx.llself {
-          some(s) {
-            alt option::map(ty::ty_to_def_id(s.t)) {|did|
-                     ty::ty_dtor(cx.tcx(), did)} {
-              some(some(_)) {
-                  /* self is a class with a dtor, which means we
-                     have to select out the object itself
-                     (If any other code does the same thing, that's
-                     a bug */
-                GEPi(cx, cast_self(cx, s), [0u, 1u])
-            }
-            _ { cast_self(cx, s) }
-           }
-          }
+          some(s) { cast_self(cx, s) }
           none { cx.sess().bug("trans_local_var: reference to self \
                                  out of context"); }
         };
@@ -2535,17 +2523,29 @@ fn trans_rec_field(bcx: block, base: @ast::expr,
 
 fn trans_rec_field_inner(bcx: block, val: ValueRef, ty: ty::t,
                          field: ast::ident, sp: span) -> lval_result {
+    let mut deref = false;
     let fields = alt ty::get(ty).struct {
        ty::ty_rec(fs) { fs }
        ty::ty_class(did, substs) {
+         if option::is_some(ty::ty_dtor(bcx.tcx(), did)) {
+           deref = true;
+         }
          ty::class_items_as_fields(bcx.tcx(), did, substs)
        }
        // Constraint?
        _ { bcx.tcx().sess.span_bug(sp, "trans_rec_field:\
                  base expr has non-record type"); }
     };
     let ix = field_idx_strict(bcx.tcx(), sp, field, fields);
-    let val = GEPi(bcx, val, [0u, ix]);
+
+    /* self is a class with a dtor, which means we
+       have to select out the object itself
+       (If any other code does the same thing, that's
+       a bug */
+    let val = if deref {
+        GEPi(bcx, GEPi(bcx, val, [0u, 1u]), [0u, ix])
+    }
+    else { GEPi(bcx, val, [0u, ix]) };
 
     ret {bcx: bcx, val: val, kind: owned};
 }