From b35a5da4ea15a826908fc07d0d77ca9ef292ac78 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Mon, 23 Dec 2019 17:19:14 +0100
Subject: [PATCH] Remove vector support from load_scalar

---
 src/value_and_place.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/value_and_place.rs b/src/value_and_place.rs
index 1d6e55b91377..8593af61edbc 100644
--- a/src/value_and_place.rs
+++ b/src/value_and_place.rs
@@ -122,14 +122,11 @@ impl<'tcx> CValue<'tcx> {
         let layout = self.1;
         match self.0 {
             CValueInner::ByRef(ptr) => {
-                let clif_ty = match layout.abi {
-                    layout::Abi::Scalar(ref scalar) => scalar_to_clif_type(fx.tcx, scalar.clone()),
-                    layout::Abi::Vector { ref element, count } => {
-                        scalar_to_clif_type(fx.tcx, element.clone())
-                            .by(u16::try_from(count).unwrap()).unwrap()
-                    }
+                let scalar = match layout.abi {
+                    layout::Abi::Scalar(ref scalar) => scalar.clone(),
                     _ => unreachable!(),
                 };
+                let clif_ty = scalar_to_clif_type(fx.tcx, scalar);
                 ptr.load(fx, clif_ty, MemFlags::new())
             }
             CValueInner::ByVal(value) => value,