fix bitcast of single-element SIMD vectors

Author: folkertdev

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

@@ -1123,7 +1123,7 @@ pub(super) fn transmute_immediate<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
     // While optimizations will remove no-op transmutes, they might still be
     // there in debug or things that aren't no-op in MIR because they change
     // the Rust type but not the underlying layout/niche.
-    if from_scalar == to_scalar {
+    if from_scalar == to_scalar && from_backend_ty == to_backend_ty {
         return imm;
     }
 
@@ -1142,13 +1142,7 @@ pub(super) fn transmute_immediate<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
     assume_scalar_range(bx, imm, from_scalar, from_backend_ty);
 
     imm = match (from_scalar.primitive(), to_scalar.primitive()) {
-        (Int(..) | Float(_), Int(..) | Float(_)) => {
-            if from_backend_ty == to_backend_ty {
-                imm
-            } else {
-                bx.bitcast(imm, to_backend_ty)
-            }
-        }
+        (Int(..) | Float(_), Int(..) | Float(_)) => bx.bitcast(imm, to_backend_ty),
         (Pointer(..), Pointer(..)) => bx.pointercast(imm, to_backend_ty),
         (Int(..), Pointer(..)) => bx.ptradd(bx.const_null(bx.type_ptr()), imm),
         (Pointer(..), Int(..)) => {

tests/codegen/transmute-scalar.rs

@@ -1,5 +1,6 @@
 //@ compile-flags: -C opt-level=0 -C no-prepopulate-passes
 
+#![feature(repr_simd)]
 #![crate_type = "lib"]
 
 // With opaque ptrs in LLVM, `transmute` can load/store any `alloca` as any type,
@@ -100,3 +101,23 @@ pub fn bool_to_fake_bool_unsigned(b: bool) -> FakeBoolUnsigned {
 pub fn fake_bool_unsigned_to_bool(b: FakeBoolUnsigned) -> bool {
     unsafe { std::mem::transmute(b) }
 }
+
+#[repr(simd)]
+#[derive(Clone, Copy)]
+struct S([i64; 1]);
+
+// CHECK-LABEL: define i64 @single_element_simd_to_scalar(<1 x i64> %b)
+// CHECK: bitcast <1 x i64> %b to i64
+// CHECK: ret i64
+#[no_mangle]
+pub extern "C" fn single_element_simd_to_scalar(b: S) -> i64 {
+    unsafe { std::mem::transmute(b) }
+}
+
+// CHECK-LABEL: define <1 x i64> @scalar_to_single_element_simd(i64 %b)
+// CHECK: bitcast i64 %b to <1 x i64>
+// CHECK: ret <1 x i64>
+#[no_mangle]
+pub extern "C" fn scalar_to_single_element_simd(b: i64) -> S {
+    unsafe { std::mem::transmute(b) }
+}