Fix type in load_scalar

diff --git a/src/intrinsics.rs b/src/intrinsics.rs
index 08a829ff1da195a50e296e424100b9b467103446..792d7c993731dc9f8bd0e9ef4f1687226235b6a7 100644 (file)
--- a/src/intrinsics.rs
+++ b/src/intrinsics.rs
@@ -103,7 +103,7 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
             // Insert non returning intrinsics here
             match intrinsic {
                 "abort" => {
-                    trap_panic(fx, "Called intrinisc::abort.");
+                    trap_panic(fx, "Called intrinsic::abort.");
                 }
                 "unreachable" => {
                     trap_unreachable(fx, "[corruption] Called intrinsic::unreachable.");

diff --git a/src/value_and_place.rs b/src/value_and_place.rs
index 3589d770572406176ef81cc3b19b71195e05c36d..8b5c764f69c89aa17ae17df6b11e41f2b0e570ff 100644 (file)
--- a/src/value_and_place.rs
+++ b/src/value_and_place.rs
@@ -51,8 +51,8 @@ fn load_scalar<'a, 'tcx: 'a>(
     offset: i32,
 ) -> Value {
     if clif_ty == types::I128 {
-        let a = fx.bcx.ins().load(clif_ty, MemFlags::new(), addr, offset);
-        let b = fx.bcx.ins().load(clif_ty, MemFlags::new(), addr, offset + 8);
+        let a = fx.bcx.ins().load(types::I64, MemFlags::new(), addr, offset);
+        let b = fx.bcx.ins().load(types::I64, MemFlags::new(), addr, offset + 8);
         fx.bcx.ins().iconcat(a, b)
     } else {
         fx.bcx.ins().load(clif_ty, MemFlags::new(), addr, offset)