---

yaml
---
r: 48508
b: refs/heads/snap-stage3
c: 5cbc257
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b673b26f03043f974682efceffbf40df9cf4bc84
+refs/heads/snap-stage3: 5cbc2571c1a4df75750fcb726120db06eb61c1f9
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/expr.rs

@@ -126,6 +126,7 @@ use lib;
 use lib::llvm::{ValueRef, TypeRef, llvm, True};
 use middle::borrowck::root_map_key;
 use middle::trans::_match;
+use middle::trans::adt;
 use middle::trans::base;
 use middle::trans::base::*;
 use middle::trans::build::*;
@@ -602,7 +603,8 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
             return trans_rec_or_struct(bcx, (*fields), base, expr.id, dest);
         }
         ast::expr_tup(ref args) => {
-            return trans_tup(bcx, *args, dest);
+            let repr = adt::represent_type(bcx.ccx(), expr_ty(bcx, expr));
+            return trans_adt(bcx, &repr, 0, *args, dest);
         }
         ast::expr_lit(@codemap::spanned {node: ast::lit_str(s), _}) => {
             return tvec::trans_lit_str(bcx, expr, s, dest);
@@ -1249,7 +1251,8 @@ fn trans_rec_or_struct(bcx: block,
     }
 }
 
-fn trans_tup(bcx: block, elts: &[@ast::expr], dest: Dest) -> block {
+fn trans_adt(bcx: block, repr: &adt::Repr, discr: int, elts: &[@ast::expr],
+             dest: Dest) -> block {
     let _icx = bcx.insn_ctxt("trans_tup");
     let mut bcx = bcx;
     let addr = match dest {
@@ -1262,8 +1265,9 @@ fn trans_tup(bcx: block, elts: &[@ast::expr], dest: Dest) -> block {
         SaveIn(pos) => pos,
     };
     let mut temp_cleanups = ~[];
+    adt::trans_set_discr(bcx, repr, addr, discr);
     for vec::eachi(elts) |i, e| {
-        let dest = GEPi(bcx, addr, [0u, i]);
+        let dest = adt::trans_GEP(bcx, repr, addr, discr, i);
         let e_ty = expr_ty(bcx, *e);
         bcx = trans_into(bcx, *e, SaveIn(dest));
         add_clean_temp_mem(bcx, dest, e_ty);