fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-14 06:35:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge #1034

Browse Source 
1034: When modifying the value, also update its ExtraInfo. r=nlewycky a=nlewycky

Fixes a debug_assert! on python3.7 and rustpython in wapm.


Co-authored-by: Nick Lewycky <nick@wasmer.io>
This commit is contained in:
bors[bot] 2019-12-03 00:02:38 +00:00 committed by GitHub
commit 183beb769e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/llvm-backend-tests/tests/compile.rs
View File

@ -18,5 +18,23 @@ fn crash_return_with_float_on_stack() {
"#; "#;
let wasm_binary = wat2wasm(MODULE.as_bytes()).expect("WAST not valid or malformed"); let wasm_binary = wat2wasm(MODULE.as_bytes()).expect("WAST not valid or malformed");
let module = compile_with(&wasm_binary, &get_compiler()).unwrap(); let module = compile_with(&wasm_binary, &get_compiler()).unwrap();
let instance = module.instantiate(&imports! {}).unwrap(); module.instantiate(&imports! {}).unwrap();
}
#[test]
fn crash_select_with_mismatched_pending() {
const MODULE: &str = r#"
(module
(func (param f64)
f64.const 0x0p+0 (;=0;)
local.get 0
f64.add
f64.const 0x0p+0 (;=0;)
i32.const 0
select
drop))
"#;
let wasm_binary = wat2wasm(MODULE.as_bytes()).expect("WAST not valid or malformed");
let module = compile_with(&wasm_binary, &get_compiler()).unwrap();
module.instantiate(&imports! {}).unwrap();
} }

6
lib/llvm-backend/src/code.rs
View File

@ -1730,15 +1730,17 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
// If the pending bits of v1 and v2 are the same, we can pass // If the pending bits of v1 and v2 are the same, we can pass
// them along to the result. Otherwise, apply pending // them along to the result. Otherwise, apply pending
// canonicalizations now. // canonicalizations now.
let (v1, v2) = if i1.has_pending_f32_nan() != i2.has_pending_f32_nan() let (v1, i1, v2, i2) = if i1.has_pending_f32_nan() != i2.has_pending_f32_nan()
|| i1.has_pending_f64_nan() != i2.has_pending_f64_nan() || i1.has_pending_f64_nan() != i2.has_pending_f64_nan()
{ {
( (
apply_pending_canonicalization(builder, intrinsics, v1, i1), apply_pending_canonicalization(builder, intrinsics, v1, i1),
i1.strip_pending(),
apply_pending_canonicalization(builder, intrinsics, v2, i2), apply_pending_canonicalization(builder, intrinsics, v2, i2),
i2.strip_pending(),
) )
} else { } else {
(v1, v2) (v1, i1, v2, i2)
}; };
let cond_value = builder.build_int_compare( let cond_value = builder.build_int_compare(
IntPredicate::NE, IntPredicate::NE,