diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2019-06-17 21:19:08 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2019-07-26 11:28:04 +0200 |
| commit | 596fdd5a6463d55d8dedd202c41a6392eca2c4c8 (patch) | |
| tree | 00f5067ab995ab92167c4e6261b91384623d1deb /src | |
| parent | d629d97f25d02d59144b3d2de144022bff9e3151 (diff) | |
| download | rust-596fdd5a6463d55d8dedd202c41a6392eca2c4c8.tar.gz rust-596fdd5a6463d55d8dedd202c41a6392eca2c4c8.zip | |
Fix type in load_scalar
Diffstat (limited to 'src')
| -rw-r--r-- | src/intrinsics.rs | 2 | ||||
| -rw-r--r-- | src/value_and_place.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/intrinsics.rs b/src/intrinsics.rs index 08a829ff1da..792d7c99373 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 3589d770572..8b5c764f69c 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) |