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

Auto merge of #81388 - bjorn3:wasm_bindgen_fix, r=nikomatsakis

Browse Source 
Fix abi for wasm-bindgen

Hopefully fixes https://github.com/rust-lang/rust/issues/81386. `@alexcrichton` can you confirm this fixes wasm-bindgen?

r? `@alexcrichton`
This commit is contained in:
bors 2021-01-28 22:01:42 +00:00
commit b05fd2a15d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_middle/src/ty/layout.rs
View File

@ -2866,10 +2866,9 @@ where
let max_by_val_size = Pointer.size(cx) * 2; let max_by_val_size = Pointer.size(cx) * 2;
let size = arg.layout.size; let size = arg.layout.size;
let is_indirect_not_on_stack = if arg.layout.is_unsized() || size > max_by_val_size {
matches!(arg.mode, PassMode::Indirect { on_stack: false, .. }); arg.make_indirect();
assert!(is_indirect_not_on_stack, "{:?}", arg); } else {
if !arg.layout.is_unsized() && size <= max_by_val_size {
// We want to pass small aggregates as immediates, but using // We want to pass small aggregates as immediates, but using
// a LLVM aggregate type for this leads to bad optimizations, // a LLVM aggregate type for this leads to bad optimizations,
// so we pick an appropriately sized integer type instead. // so we pick an appropriately sized integer type instead.

4
compiler/rustc_target/src/abi/call/mod.rs
View File

@ -32,7 +32,7 @@ pub enum PassMode {
Ignore, Ignore,
/// Pass the argument directly. /// Pass the argument directly.
/// ///
/// The argument has a layout abi of `Scalar` or `Vector`. /// The argument has a layout abi of `Scalar`, `Vector` or in rare cases `Aggregate`.
Direct(ArgAttributes), Direct(ArgAttributes),
/// Pass a pair's elements directly in two arguments. /// Pass a pair's elements directly in two arguments.
/// ///
@ -453,7 +453,7 @@ impl<'a, Ty> ArgAbi<'a, Ty> {
scalar_attrs(&layout, b, a.value.size(cx).align_to(b.value.align(cx).abi)), scalar_attrs(&layout, b, a.value.size(cx).align_to(b.value.align(cx).abi)),
), ),
Abi::Vector { .. } => PassMode::Direct(ArgAttributes::new()), Abi::Vector { .. } => PassMode::Direct(ArgAttributes::new()),
Abi::Aggregate { .. } => Self::indirect_pass_mode(&layout), Abi::Aggregate { .. } => PassMode::Direct(ArgAttributes::new()),
}; };
ArgAbi { layout, pad: None, mode } ArgAbi { layout, pad: None, mode }
} }