Skip to content

cranelift: Fix spillslot regression on big-endian platforms #2843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfallin merged 1 commit into from
Apr 15, 2021
Merged

cranelift: Fix spillslot regression on big-endian platforms #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cranelift/codegen/src/machinst/abi_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,15 @@ impl<M: ABIMachineSpec> ABICallee for ABICalleeImpl<M> {
let spill_off = islot * M::word_bytes() as i64;
let sp_off = self.stackslots_size as i64 + spill_off;
trace!("load_spillslot: slot {:?} -> sp_off {}", slot, sp_off);

// Integer types smaller than word size have been spilled as words below,
// and therefore must be reloaded in the same type.
let ty = if ty.is_int() && ty.bytes() < M::word_bytes() {
M::word_type()
} else {
ty
};

gen_load_stack_multi::<M>(StackAMode::NominalSPOffset(sp_off, ty), into_regs, ty)
}

Expand Down
2 changes: 1 addition & 1 deletion cranelift/filetests/filetests/isa/x64/store-stack-full-width-i32.clif
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ block0(v0: i32, v1: i32, v2: i32):
;; This should be movq below, not movl.
; nextln: movq %rsi, rsp(0 + virtual offset)

; nextln: movslq rsp(0 + virtual offset), %rsi
; nextln: movq rsp(0 + virtual offset), %rsi
; nextln: addl %edi, %esi

;; Put an effectful instruction so that the live-ranges of the adds and
Expand Down