From 777d4732dc2389752ebaa4fc7256245c4873bc25 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 29 Oct 2022 13:47:10 +0000
Subject: [PATCH] Fix transmuting from vector type to ScalarPair type

Fixes #1292
---
 example/std_example.rs | 2 ++
 src/value_and_place.rs | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/example/std_example.rs b/example/std_example.rs
index ad108c34992e..8481d9c39a3c 100644
--- a/example/std_example.rs
+++ b/example/std_example.rs
@@ -164,6 +164,8 @@ unsafe fn test_simd() {
     let cmp_eq = _mm_cmpeq_epi8(y, y);
     let cmp_lt = _mm_cmplt_epi8(y, y);
 
+    let (zero0, zero1) = std::mem::transmute::<_, (u64, u64)>(x);
+    assert_eq!((zero0, zero1), (0, 0));
     assert_eq!(std::mem::transmute::<_, [u16; 8]>(or), [7, 7, 7, 7, 7, 7, 7, 7]);
     assert_eq!(std::mem::transmute::<_, [u16; 8]>(cmp_eq), [0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff]);
     assert_eq!(std::mem::transmute::<_, [u16; 8]>(cmp_lt), [0, 0, 0, 0, 0, 0, 0, 0]);
diff --git a/src/value_and_place.rs b/src/value_and_place.rs
index 75f968f3f4b8..6399b97012b1 100644
--- a/src/value_and_place.rs
+++ b/src/value_and_place.rs
@@ -590,7 +590,10 @@ impl<'tcx> CPlace<'tcx> {
                 return;
             }
             CPlaceInner::VarPair(_local, var1, var2) => {
-                let (data1, data2) = CValue(from.0, dst_layout).load_scalar_pair(fx);
+                let (ptr, meta) = from.force_stack(fx);
+                assert!(meta.is_none());
+                let (data1, data2) =
+                    CValue(CValueInner::ByRef(ptr, None), dst_layout).load_scalar_pair(fx);
                 let (dst_ty1, dst_ty2) = fx.clif_pair_type(self.layout().ty).unwrap();
                 transmute_value(fx, var1, data1, dst_ty1);
                 transmute_value(fx, var2, data2, dst_ty2);