---

yaml
---
r: 6379
b: refs/heads/master
c: 196b2b9
h: refs/heads/master
i:
  6377: ea15f3e
  6375: 13a625e
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68db68c4cccb9204e91ffcd08fd27be0f33f0033
+refs/heads/master: 196b2b920f9094cb78cc041709b3c3456b020fbd

trunk/src/comp/middle/trans.rs

@@ -4035,34 +4035,35 @@ fn trans_rec(bcx: @block_ctxt, fields: [ast::field],
       save_in(pos) { pos }
     };
 
-    let base_val = alt base {
+    let ty_fields = alt ty::struct(bcx_tcx(bcx), t) { ty::ty_rec(f) { f } };
+    let temp_cleanups = [];
+    for fld in fields {
+        let ix = option::get(vec::position_pred({|ft|
+            str::eq(fld.node.ident, ft.ident)
+        }, ty_fields));
+        let dst = GEP_tup_like_1(bcx, t, addr, [0, ix as int]);
+        bcx = trans_expr_save_in(dst.bcx, fld.node.expr, dst.val);
+        add_clean_temp_mem(bcx, dst.val, ty_fields[ix].mt.ty);
+        temp_cleanups += [dst.val];
+    }
+    alt base {
       some(bexp) {
-        let base_res = trans_temp_expr(bcx, bexp);
-        bcx = base_res.bcx;
-        base_res.val
+        let {bcx: cx, val: base_val} = trans_temp_expr(bcx, bexp), i = 0;
+        bcx = cx;
+        // Copy over inherited fields
+        for tf in ty_fields {
+            if !vec::any({|f| str::eq(f.node.ident, tf.ident)}, fields) {
+                let dst = GEP_tup_like_1(bcx, t, addr, [0, i]);
+                let base = GEP_tup_like_1(bcx, t, base_val, [0, i]);
+                let val = load_if_immediate(base.bcx, base.val, tf.mt.ty);
+                bcx = copy_val(base.bcx, INIT, dst.val, val, tf.mt.ty);
+            }
+            i += 1;
+        }
       }
-      none. { C_nil() }
+      none. {}
     };
 
-    let ty_fields = alt ty::struct(bcx_tcx(bcx), t) { ty::ty_rec(f) { f } };
-    let temp_cleanups = [], i = 0;
-    for tf in ty_fields {
-        let dst = GEP_tup_like_1(bcx, t, addr, [0, i]);
-        bcx = dst.bcx;
-        alt vec::find({|f| str::eq(f.node.ident, tf.ident)}, fields) {
-          some(f) {
-            bcx = trans_expr_save_in(bcx, f.node.expr, dst.val);
-          }
-          none. {
-            let base = GEP_tup_like_1(bcx, t, base_val, [0, i]);
-            let val = load_if_immediate(base.bcx, base.val, tf.mt.ty);
-            bcx = copy_val(base.bcx, INIT, dst.val, val, tf.mt.ty);
-          }
-        }
-        add_clean_temp_mem(bcx, dst.val, tf.mt.ty);
-        temp_cleanups += [dst.val];
-        i += 1;
-    }
     // Now revoke the cleanups as we pass responsibility for the data
     // structure on to the caller
     for cleanup in temp_cleanups { revoke_clean(bcx, cleanup); }