A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
pulley: Fix big-endian results in a spillslot (#11597)
Alex Crichton8be22ddf423c
diff --git a/cranelift/codegen/src/machinst/abi.rs b/cranelift/codegen/src/machinst/abi.rsindex d709202e00..217a69ab58 100644--- a/cranelift/codegen/src/machinst/abi.rs+++ b/cranelift/codegen/src/machinst/abi.rs@@ -2477,11 +2477,14 @@ impl<T> CallInfo<T> {// returns), we use the integer temp register in// steps.let parts = (ty.bytes() + M::word_bytes() - 1) / M::word_bytes();+ let one_part_load_ty =+ Type::int_with_byte_size(M::word_bytes().min(ty.bytes()) as u16)+ .unwrap();for part in 0..parts {emit(M::gen_load_stack(amode.offset_by(part * M::word_bytes()),temp,- M::word_type(),+ one_part_load_ty,));emit(M::gen_store_stack(StackAMode::Slot(diff --git a/crates/test-util/src/wast.rs b/crates/test-util/src/wast.rsindex c719843eaa..45d899e608 100644--- a/crates/test-util/src/wast.rs+++ b/crates/test-util/src/wast.rs@@ -293,7 +293,13 @@ impl Compiler {/// `Config::compiler_panicking_wasm_features`.pub fn should_fail(&self, config: &TestConfig) -> bool {match self {- Compiler::CraneliftNative => config.legacy_exceptions(),+ Compiler::CraneliftNative => {+ // FIXME(#11602) temporarily disabled+ if cfg!(target_arch = "s390x") && config.exceptions() {+ return true;+ }+ config.legacy_exceptions()+ }Compiler::Winch => {let unsupported_base = config.gc()diff --git a/crates/wasmtime/src/config.rs b/crates/wasmtime/src/config.rsindex 693865c4e9..2a11ae3807 100644--- a/crates/wasmtime/src/config.rs+++ b/crates/wasmtime/src/config.rs@@ -2087,6 +2087,11 @@ impl Config {unsupported |= WasmFeatures::STACK_SWITCHING;}+ // FIXME(#11602) temporarily disabled+ if self.compiler_target().architecture == target_lexicon::Architecture::S390x {+ unsupported |= WasmFeatures::EXCEPTIONS;+ }+use target_lexicon::*;match self.compiler_target() {Triple {diff --git a/tests/misc_testsuite/many-results-with-exceptions.wast b/tests/misc_testsuite/many-results-with-exceptions.wastnew file mode 100644index 0000000000..eb6a65e3d8--- /dev/null+++ b/tests/misc_testsuite/many-results-with-exceptions.wast@@ -0,0 +1,183 @@+;;! exceptions = true++(module+ (func (export "f")+ (result+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )++ (block $h+ (try_table (catch_all $h)+ call $f_callee+ return+ )+ )+ unreachable+ )+ (func $f_callee+ (result+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )++ i32.const 0+ i32.const 1+ i32.const 2+ i32.const 3+ i32.const 4+ i32.const 5+ i32.const 6+ i32.const 7+ i32.const 8+ i32.const 9+ i32.const 10+ i32.const 11+ i32.const 12+ i32.const 13+ i32.const 14+ i32.const 15+ i32.const 16+ )++ (func (export "f2")+ (param+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )+ (result+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )++ (block $h+ (try_table (catch_all $h)+ local.get 0+ local.get 1+ local.get 2+ local.get 3+ local.get 4+ local.get 5+ local.get 6+ local.get 7+ local.get 8+ local.get 9+ local.get 10+ local.get 11+ local.get 12+ local.get 13+ local.get 14+ local.get 15+ local.get 16++ call $f2_callee+ return+ )+ )+ unreachable+ )+ (func $f2_callee+ (param+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )+ (result+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )++ local.get 0+ local.get 1+ local.get 2+ local.get 3+ local.get 4+ local.get 5+ local.get 6+ local.get 7+ local.get 8+ local.get 9+ local.get 10+ local.get 11+ local.get 12+ local.get 13+ local.get 14+ local.get 15+ local.get 16+ )+)++(assert_return (invoke "f")+ (i32.const 0)+ (i32.const 1)+ (i32.const 2)+ (i32.const 3)+ (i32.const 4)+ (i32.const 5)+ (i32.const 6)+ (i32.const 7)+ (i32.const 8)+ (i32.const 9)+ (i32.const 10)+ (i32.const 11)+ (i32.const 12)+ (i32.const 13)+ (i32.const 14)+ (i32.const 15)+ (i32.const 16)+)++(assert_return (invoke "f2"+ (i32.const 0)+ (i32.const 1)+ (i32.const 2)+ (i32.const 3)+ (i32.const 4)+ (i32.const 5)+ (i32.const 6)+ (i32.const 7)+ (i32.const 8)+ (i32.const 9)+ (i32.const 10)+ (i32.const 11)+ (i32.const 12)+ (i32.const 13)+ (i32.const 14)+ (i32.const 15)+ (i32.const 16)+ )+ (i32.const 0)+ (i32.const 1)+ (i32.const 2)+ (i32.const 3)+ (i32.const 4)+ (i32.const 5)+ (i32.const 6)+ (i32.const 7)+ (i32.const 8)+ (i32.const 9)+ (i32.const 10)+ (i32.const 11)+ (i32.const 12)+ (i32.const 13)+ (i32.const 14)+ (i32.const 15)+ (i32.const 16)+)diff --git a/tests/misc_testsuite/many-results.wast b/tests/misc_testsuite/many-results.wastindex 04dd829100..40d661d8bc 100644--- a/tests/misc_testsuite/many-results.wast+++ b/tests/misc_testsuite/many-results.wast@@ -26,6 +26,41 @@i32.const 15i32.const 16)++ (func (export "f2")+ (param+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )+ (result+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32 i32 i32 i32+ i32+ )++ local.get 0+ local.get 1+ local.get 2+ local.get 3+ local.get 4+ local.get 5+ local.get 6+ local.get 7+ local.get 8+ local.get 9+ local.get 10+ local.get 11+ local.get 12+ local.get 13+ local.get 14+ local.get 15+ local.get 16+ ))(assert_return (invoke "f")@@ -47,3 +82,41 @@(i32.const 15)(i32.const 16))++(assert_return (invoke "f2"+ (i32.const 0)+ (i32.const 1)+ (i32.const 2)+ (i32.const 3)+ (i32.const 4)+ (i32.const 5)+ (i32.const 6)+ (i32.const 7)+ (i32.const 8)+ (i32.const 9)+ (i32.const 10)+ (i32.const 11)+ (i32.const 12)+ (i32.const 13)+ (i32.const 14)+ (i32.const 15)+ (i32.const 16)+ )+ (i32.const 0)+ (i32.const 1)+ (i32.const 2)+ (i32.const 3)+ (i32.const 4)+ (i32.const 5)+ (i32.const 6)+ (i32.const 7)+ (i32.const 8)+ (i32.const 9)+ (i32.const 10)+ (i32.const 11)+ (i32.const 12)+ (i32.const 13)+ (i32.const 14)+ (i32.const 15)+ (i32.const 16)+)