T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

components: fix trampoline compilation for lists. (#4579)

Browse Source 
This commit fixes trampoline compilation for lists where the loop condition
would only branch if the amount remaining was 0 instead of not 0.

It resulted in only the first element of the list being copied.
This commit is contained in:
Peter Huene
2022-08-02 13:28:43 -07:00
committed by GitHub
parent 8dddd6f1f7
commit 43125aa994
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/environ/src/fact/trampoline.rs
View File

@@ -833,6 +833,7 @@ impl Compiler<'_, '_> {
let src_add = if src_opts.memory64 { I64Add } else { I32Add }; let src_add = if src_opts.memory64 { I64Add } else { I32Add };
let dst_add = if dst_opts.memory64 { I64Add } else { I32Add }; let dst_add = if dst_opts.memory64 { I64Add } else { I32Add };
let src_eqz = if src_opts.memory64 { I64Eqz } else { I32Eqz }; let src_eqz = if src_opts.memory64 { I64Eqz } else { I32Eqz };
let src_ne = if src_opts.memory64 { I64Ne } else { I32Ne };
// This block encompasses the entire loop and is use to exit before even // This block encompasses the entire loop and is use to exit before even
// entering the loop if the list size is zero. // entering the loop if the list size is zero.
@@ -887,7 +888,8 @@ impl Compiler<'_, '_> {
self.instruction(iconst(-1, src_opts.ptr())); self.instruction(iconst(-1, src_opts.ptr()));
self.instruction(src_add.clone()); self.instruction(src_add.clone());
self.instruction(LocalTee(remaining)); self.instruction(LocalTee(remaining));
self.instruction(src_eqz.clone()); self.instruction(iconst(0, src_opts.ptr()));
self.instruction(src_ne.clone());
self.instruction(BrIf(0)); self.instruction(BrIf(0));
self.instruction(End); // end of loop self.instruction(End); // end of loop
self.instruction(End); // end of block self.instruction(End); // end of block