---

yaml
---
r: 45010
b: refs/heads/master
c: 8a17066
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5e2302a56f7615b73e42daaa242da4bd64b25d93
+refs/heads/master: 8a1706610b2cf458fe6e5ed12e227e3ca9dcaa6d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/middle/trans/adt.rs

@@ -205,24 +205,28 @@ pub fn trans_GEP(bcx: block, r: &Repr, val: ValueRef, discr: int, ix: uint)
                 NoDtor => val,
                 DtorPresent | DtorAbsent => GEPi(bcx, val, [0, 0])
             };
-            struct_GEP(bcx, st, val, ix)
+            struct_GEP(bcx, st, val, ix, false)
         }
         General(ref cases) => {
             struct_GEP(bcx, &cases[discr as uint],
-                       GEPi(bcx, val, [0, 1]), ix)
+                       GEPi(bcx, val, [0, 1]), ix, true)
         }
     }
 }
 
-fn struct_GEP(bcx: block, st: &Struct, val: ValueRef, ix: uint)
-    -> ValueRef {
+fn struct_GEP(bcx: block, st: &Struct, val: ValueRef, ix: uint,
+              needs_cast: bool) -> ValueRef {
     let ccx = bcx.ccx();
 
-    let real_llty = T_struct(st.fields.map(
-        |&ty| type_of::type_of(ccx, ty)));
-    let cast_val = PointerCast(bcx, val, T_ptr(real_llty));
+    let val = if needs_cast {
+        let real_llty = T_struct(st.fields.map(
+            |&ty| type_of::type_of(ccx, ty)));
+        PointerCast(bcx, val, T_ptr(real_llty))
+    } else {
+        val
+    };
 
-    GEPi(bcx, cast_val, [0, ix])
+    GEPi(bcx, val, [0, ix])
 }
 
 pub fn trans_const(ccx: @CrateContext, r: &Repr, discr: int,