---

yaml
---
r: 42370
b: refs/heads/master
c: 9123c58
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6cdc283415973c259cfbc869f8c7faed5d4f7e2a
+refs/heads/master: 9123c585268fb7ae844b6cd98559a76ba080448f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/ptr.rs

@@ -187,18 +187,7 @@ pub trait Ptr<T> {
     pure fn offset(count: uint) -> Self;
 }
 
-#[cfg(stage0)]
-unsafe fn memmove32(dst: *mut u8, src: *const u8, count: u32) {
-    libc::memmove(dst as *c_void, src as *c_void, count as size_t);
-}
-#[cfg(stage0)]
-unsafe fn memmove64(dst: *mut u8, src: *const u8, count: u64) {
-    libc::memmove(dst as *c_void, src as *c_void, count as size_t);
-}
-
 #[abi="rust-intrinsic"]
-#[cfg(stage1)]
-#[cfg(stage2)]
 pub extern {
     fn memmove32(dst: *mut u8, src: *u8, size: u32);
     fn memmove64(dst: *mut u8, src: *u8, size: u64);

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

@@ -434,13 +434,7 @@ pub fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
                     let lldiscrim = base::get_discrim_val(cx, e.span,
                                                           enum_did,
                                                           variant_did);
-                    // However, we still have to pad it out to the
-                    // size of the full enum; see the expr_call case,
-                    // below.
-                    let ety = ty::expr_ty(cx.tcx, e);
-                    let size = machine::static_size_of_enum(cx, ety);
-                    let padding = C_null(T_array(T_i8(), size));
-                    C_struct(~[lldiscrim, padding])
+                    C_struct(~[lldiscrim])
                 }
                 Some(ast::def_struct(_)) => {
                     let ety = ty::expr_ty(cx.tcx, e);
@@ -476,20 +470,7 @@ pub fn const_expr(cx: @crate_ctxt, e: @ast::expr) -> ValueRef {
 
                 // FIXME (#1645): enum body alignment is generaly wrong.
                 if !degen {
-                    // Pad out the data to the size of its type_of;
-                    // this is necessary if the enum is contained
-                    // within an aggregate (tuple, struct, vector) so
-                    // that the next element is at the right offset.
-                    let actual_size =
-                        machine::llsize_of_real(cx, llvm::LLVMTypeOf(c_args));
-                    let padding =
-                        C_null(T_array(T_i8(), size - actual_size));
-                    // A packed_struct has an alignment of 1; thus,
-                    // wrapping one around c_args will misalign it the
-                    // same way we normally misalign enum bodies
-                    // without affecting its internal alignment or
-                    // changing the alignment of the enum.
-                    C_struct(~[discrim, C_packed_struct(~[c_args]), padding])
+                    C_packed_struct(~[discrim, c_args])
                 } else if size == 0 {
                     C_struct(~[discrim])
                 } else {