---

yaml
---
r: 52479
b: refs/heads/dist-snap
c: cb1f957
h: refs/heads/master
i:
  52477: a5cf03c
  52475: a1f7565
  52471: dd1b214
  52463: 7393dfa
  52447: 305f507
  52415: 7a931d0
  52351: 4325e6a
  52223: 2fc528a
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 4f88ed36a132cf74d45d996b26c3587e0d54a2cf
+refs/heads/dist-snap: cb1f957f71b4fafa3b9a39a03fe8b99df0c658a2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/common.rs

@@ -1209,6 +1209,14 @@ fn C_struct(elts: &[ValueRef]) -> ValueRef {
     }
 }
 
+fn C_packed_struct(elts: &[ValueRef]) -> ValueRef {
+    unsafe {
+        do vec::as_imm_buf(elts) |ptr, len| {
+            llvm::LLVMConstStruct(ptr, len as c_uint, True)
+        }
+    }
+}
+
 fn C_named_struct(T: TypeRef, elts: &[ValueRef]) -> ValueRef {
     unsafe {
         do vec::as_imm_buf(elts) |ptr, len| {

branches/dist-snap/src/librustc/middle/trans/consts.rs

@@ -455,15 +455,14 @@ fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                 let discrim = base::get_discrim_val(cx, e.span, tid, vid);
                 let c_args = C_struct(args.map(|a| const_expr(cx, *a)));
 
-                let fields = if !degen {
-                    ~[discrim, c_args]
+                // FIXME (#1645): enum body alignment is generaly wrong.
+                if !degen {
+                    C_packed_struct(~[discrim, c_args])
                 } else if size == 0 {
-                    ~[discrim]
+                    C_struct(~[discrim])
                 } else {
-                    ~[c_args]
-                };
-
-                C_struct(fields)
+                    C_struct(~[c_args])
+                }
             }
                 _ => cx.sess.span_bug(e.span, ~"expected a struct def")
             }