From 596fdd5a6463d55d8dedd202c41a6392eca2c4c8 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Mon, 17 Jun 2019 21:19:08 +0200 Subject: [PATCH] Fix type in load_scalar --- src/intrinsics.rs | 2 +- src/value_and_place.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intrinsics.rs b/src/intrinsics.rs index 08a829ff1da1..792d7c993731 100644 --- 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 3589d7705724..8b5c764f69c8 100644 --- 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)