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.

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
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
- [#2157](https://github.com/wasmerio/wasmer/pull/2157) Simplify the code behind `WasmPtr`

### Fixed
- [#2391](https://github.com/wasmerio/wasmer/pull/2391) Fix Singlepass emit bug, [#2347](https://github.com/wasmerio/wasmer/issues/2347) and [#2159](https://github.com/wasmerio/wasmer/issues/2159)
- [#2327](https://github.com/wasmerio/wasmer/pull/2327) Fix memory leak preventing internal instance memory from being freed when a WasmerEnv contained an exported extern (e.g. Memory, etc.).
- [#2247](https://github.com/wasmerio/wasmer/pull/2247) Internal WasiFS logic updated to be closer to what WASI libc does when finding a preopened fd for a path.
- [#2241](https://github.com/wasmerio/wasmer/pull/2241) Fix Undefined Behavior in setting memory in emscripten `EmEnv`.
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler-singlepass/src/codegen_x64.rs
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
14 changes: 14 additions & 0 deletions tests/wast/wasmer/nan-canonicalization-bug1.wast
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
;; https://github.com/wasmerio/wasmer/issues/2347
(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))

10 changes: 10 additions & 0 deletions tests/wast/wasmer/nan-canonicalization-bug2.wast
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
;; https://github.com/wasmerio/wasmer/issues/2159
(module
(func (export "_start") (result f64)
f64.const 0x0p+0 (;=0;)
f64.const 0x0p+0 (;=0;)
f64.const 0x0p+0 (;=0;)
f64.div
f64.copysign
)
)