Skip to content
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

Fix Singlepass issue #2347 #2391

Merged
merged 5 commits into from
Jun 15, 2021
Merged

Fix Singlepass issue #2347 #2391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc0dcd0
fix singlepass issue #2347
chenyukang Jun 5, 2021
57edf70
refactor unitcase and add changelog
chenyukang Jun 7, 2021
c0440c5
Merge branch 'wasmerio:master' into fix-singlepass-emit
chenyukang Jun 7, 2021
af59712
add testcase
chenyukang Jun 7, 2021
b99542b
rename testcase file
chenyukang Jun 8, 2021
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
2 changes: 1 addition & 1 deletion lib/compiler-singlepass/src/codegen_x64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ impl<'a> FuncGen<'a> {
let tmp1 = self.machine.acquire_temp_xmm().unwrap();
let tmp2 = self.machine.acquire_temp_xmm().unwrap();
let tmp3 = self.machine.acquire_temp_xmm().unwrap();
let tmpg1 = self.machine.acquire_temp_gpr().unwrap();

self.emit_relaxed_binop(Assembler::emit_mov, sz, input, Location::XMM(tmp1));
let tmpg1 = self.machine.acquire_temp_gpr().unwrap();

match sz {
Size::S32 => {
Expand Down
27 changes: 27 additions & 0 deletions tests/compilers/imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ use std::sync::{
Arc,
};
use wasmer::*;
#[cfg(feature = "singlepass")]
use wasmer_compiler_singlepass::Singlepass;
use wasmer_engine_universal::Universal;

fn get_module(store: &Store) -> Result<Module> {
let wat = r#"
Expand Down Expand Up @@ -432,3 +435,27 @@ fn instance_local_memory_lifetime(config: crate::Config) -> Result<()> {

Ok(())
}

#[cfg(feature = "singlepass")]
#[test]
fn test_singlepass_emit_bug() -> Result<()> {
// https://github.com/wasmerio/wasmer/issues/2347
let wat = r#"(module
(type (;0;) (func (param f64) (result i32)))
(func (;0;) (type 0) (param f64) (result i32)
unreachable)
(func (;1;) (type 0) (param f64) (result i32)
i32.const -16579585
f64.convert_i32_s
f64.ceil
f64.ceil
local.get 0
f64.copysign
unreachable))
"#;

let store = Store::new(&Universal::new(Singlepass::default()).engine());
let module = Module::new(&store, wat)?;

Ok(())
}