]> git.lizzy.rs Git - rust.git/commitdiff
Remove vector support from load_scalar
authorbjorn3 <bjorn3@users.noreply.github.com>
Mon, 23 Dec 2019 16:19:14 +0000 (17:19 +0100)
committerbjorn3 <bjorn3@users.noreply.github.com>
Wed, 25 Dec 2019 13:38:51 +0000 (14:38 +0100)
src/value_and_place.rs

index 1d6e55b9137714fc1f2d0ea9ce4c402405ca1178..8593af61edbcc91af8cd14cc8fe4cddb6e73b0ea 100644 (file)
@@ -122,14 +122,11 @@ pub fn load_scalar<'a>(self, fx: &mut FunctionCx<'_, 'tcx, impl Backend>) -> Val
         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,