From ab0de546694c035274764813cd5fa7474a359629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= <bsteinbr@gmail.com>
Date: Wed, 27 Apr 2016 10:27:02 +0200
Subject: [PATCH] Fix transmute::<T, U> where T requires a bigger alignment
 than U

For types that are not bitcast-compatible, transmute tries to avoid
generating a temporary by translating its source expression directly
into its destination, but when the source type has a bigger alignment
requirement than the destination, this can lead to code that breaks due
to misaligned stores. So in that case we need to generate a temporary
for the source expression and then copy that into the destination,
setting the proper alignment information on the memcpy/store.

Fixes #32947
---
 src/librustc_trans/intrinsic.rs  | 23 +++++++++++++++++++-
 src/test/run-pass/issue-32947.rs | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/test/run-pass/issue-32947.rs

diff --git a/src/librustc_trans/intrinsic.rs b/src/librustc_trans/intrinsic.rs
index 1220fbafa29c9..a3969ff28454c 100644
--- a/src/librustc_trans/intrinsic.rs
+++ b/src/librustc_trans/intrinsic.rs
@@ -227,7 +227,28 @@ pub fn trans_intrinsic_call<'a, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
                         expr::SaveIn(d) => expr::SaveIn(PointerCast(bcx, d, llintype.ptr_to())),
                         expr::Ignore => expr::Ignore
                     };
-                    bcx = expr::trans_into(bcx, &arg_exprs[0], dest);
+                    let in_align = type_of::align_of(ccx, in_type);
+                    let out_align = type_of::align_of(ccx, out_type);
+                    if out_align >= in_align {
+                        bcx = expr::trans_into(bcx, &arg_exprs[0], dest);
+                    } else {
+                        let datum = unpack_datum!(bcx, expr::trans(bcx, &arg_exprs[0]));
+                        let datum = unpack_datum!(bcx, datum.to_rvalue_datum(bcx, "transmute"));
+                        match dest {
+                            expr::SaveIn(d) => {
+                                if datum.kind.is_by_ref() {
+                                    let llsz = machine::llsize_of(bcx.ccx(), llouttype);
+                                    call_memcpy(&B(bcx), d, datum.val, llsz, out_align as u32);
+                                } else {
+                                    let store = Store(bcx, datum.val, d);
+                                    unsafe {
+                                        llvm::LLVMSetAlignment(store, out_align);
+                                    }
+                                }
+                            }
+                            expr::Ignore => {}
+                        }
+                    }
                     dest
                 };
 
diff --git a/src/test/run-pass/issue-32947.rs b/src/test/run-pass/issue-32947.rs
new file mode 100644
index 0000000000000..af372fb95d083
--- /dev/null
+++ b/src/test/run-pass/issue-32947.rs
@@ -0,0 +1,36 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(repr_simd, test)]
+
+extern crate test;
+
+#[repr(simd)]
+pub struct Mu64(pub u64, pub u64, pub u64, pub u64);
+
+#[inline(never)]
+fn new(x: u64) -> Mu64 {
+    Mu64(x, x, x, x)
+}
+
+#[inline(never)]
+fn invoke_doom(x: &u8) -> [u8; 32] {
+    // This transmute used to directly store the SIMD vector into a location
+    // that isn't necessarily properly aligned
+    unsafe { std::mem::transmute(new(*x as u64)) }
+}
+
+fn main() {
+    // Try to get the dest for the invoke_doom calls to be misaligned even in optimized builds
+    let x = 0;
+    test::black_box(invoke_doom(&x));
+    let y = 1;
+    test::black_box(invoke_doom(&y));
+}