---

yaml
---
r: 47757
b: refs/heads/incoming
c: e8732bd
h: refs/heads/master
i:
  47755: 73ed837
v: v3

Author: jld

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 7c34908e69d6cd51e3764f0be63a7a74484d6fe2
+refs/heads/incoming: e8732bde5ebc29ea69cc7d2c1637490d26424b2d
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/type_of.rs

@@ -328,20 +328,11 @@ pub fn type_of(cx: @crate_ctxt, t: ty::t) -> TypeRef {
 pub fn enum_body_types(cx: @crate_ctxt, did: ast::def_id, t: ty::t)
                     -> ~[TypeRef] {
     let univar = ty::enum_is_univariant(cx.tcx, did);
+    let size = machine::static_size_of_enum(cx, t);
     if !univar {
-        let size = machine::static_size_of_enum(cx, t);
         ~[T_enum_discrim(cx), T_array(T_i8(), size)]
-    }
-    else {
-        // Use the actual fields, so we get the alignment right.
-        match ty::get(t).sty {
-            ty::ty_enum(_, ref substs) => {
-                do ty::enum_variants(cx.tcx, did)[0].args.map |&field_ty| {
-                    sizing_type_of(cx, ty::subst(cx.tcx, substs, field_ty))
-                }
-            }
-            _ => cx.sess.bug(~"enum is not an enum")
-        }
+    } else {
+        ~[T_array(T_i8(), size)]
     }
 }