nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 17:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix type in load_scalar

Browse Source
This commit is contained in:
bjorn3 2019-06-17 21:19:08 +02:00
parent d629d97f25
commit 596fdd5a64
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/intrinsics.rs
View File

@ -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.");

4
src/value_and_place.rs
View File

@ -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)