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

Enable assert_unlinkable check (#451)

Browse Source
This commit is contained in:
Artur Jamro
2019-10-25 00:37:01 +02:00
committed by Dan Gohman
parent 875eea6052
commit 5a10879d5b
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wasmtime-jit/src/link.rs
View File

@@ -41,7 +41,7 @@ pub fn link_module(
// TODO: If the difference is in the calling convention, // TODO: If the difference is in the calling convention,
// we could emit a wrapper function to fix it up. // we could emit a wrapper function to fix it up.
return Err(LinkError( return Err(LinkError(
format!("{}/{}: exported function with signature {} incompatible with function import with signature {}", format!("{}/{}: incompatible import type: exported function with signature {} incompatible with function import with signature {}",
module_name, field, module_name, field,
signature, import_signature) signature, import_signature)
)); ));
@@ -54,14 +54,14 @@ pub fn link_module(
} }
Export::Table { .. } | Export::Memory { .. } | Export::Global { .. } => { Export::Table { .. } | Export::Memory { .. } | Export::Global { .. } => {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: export not compatible with function import", "{}/{}: incompatible import type: export incompatible with function import",
module_name, field module_name, field
))); )));
} }
}, },
None => { None => {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: no provided import function", "{}/{}: unknown import function: function not provided",
module_name, field module_name, field
))); )));
} }
@@ -80,7 +80,7 @@ pub fn link_module(
let import_table = &module.table_plans[index]; let import_table = &module.table_plans[index];
if !is_table_compatible(&table, import_table) { if !is_table_compatible(&table, import_table) {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: exported table incompatible with table import", "{}/{}: incompatible import type: exported table incompatible with table import",
module_name, field, module_name, field,
))); )));
} }
@@ -92,14 +92,14 @@ pub fn link_module(
} }
Export::Global { .. } | Export::Memory { .. } | Export::Function { .. } => { Export::Global { .. } | Export::Memory { .. } | Export::Function { .. } => {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: export not compatible with table import", "{}/{}: incompatible import type: export incompatible with table import",
module_name, field module_name, field
))); )));
} }
}, },
None => { None => {
return Err(LinkError(format!( return Err(LinkError(format!(
"no provided import table for {}/{}", "unknown import: no provided import table for {}/{}",
module_name, field module_name, field
))); )));
} }
@@ -118,7 +118,7 @@ pub fn link_module(
let import_memory = &module.memory_plans[index]; let import_memory = &module.memory_plans[index];
if !is_memory_compatible(&memory, import_memory) { if !is_memory_compatible(&memory, import_memory) {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: exported memory incompatible with memory import", "{}/{}: incompatible import type: exported memory incompatible with memory import",
module_name, field module_name, field
))); )));
} }
@@ -146,14 +146,14 @@ pub fn link_module(
} }
Export::Table { .. } | Export::Global { .. } | Export::Function { .. } => { Export::Table { .. } | Export::Global { .. } | Export::Function { .. } => {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: export not compatible with memory import", "{}/{}: incompatible import type: export incompatible with memory import",
module_name, field module_name, field
))); )));
} }
}, },
None => { None => {
return Err(LinkError(format!( return Err(LinkError(format!(
"no provided import memory for {}/{}", "unknown import: no provided import memory for {}/{}",
module_name, field module_name, field
))); )));
} }
@@ -166,7 +166,7 @@ pub fn link_module(
Some(export_value) => match export_value { Some(export_value) => match export_value {
Export::Table { .. } | Export::Memory { .. } | Export::Function { .. } => { Export::Table { .. } | Export::Memory { .. } | Export::Function { .. } => {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: exported global incompatible with global import", "{}/{}: incompatible import type: exported global incompatible with global import",
module_name, field module_name, field
))); )));
} }
@@ -178,7 +178,7 @@ pub fn link_module(
let imported_global = module.globals[index]; let imported_global = module.globals[index];
if !is_global_compatible(&global, &imported_global) { if !is_global_compatible(&global, &imported_global) {
return Err(LinkError(format!( return Err(LinkError(format!(
"{}/{}: exported global incompatible with global import", "{}/{}: incompatible import type: exported global incompatible with global import",
module_name, field module_name, field
))); )));
} }
@@ -188,7 +188,7 @@ pub fn link_module(
}, },
None => { None => {
return Err(LinkError(format!( return Err(LinkError(format!(
"no provided import global for {}/{}", "unknown import: no provided import global for {}/{}",
module_name, field module_name, field
))); )));
} }

47
wasmtime-wast/src/wast.rs
View File

@@ -316,12 +316,16 @@ impl WastContext {
Ok(()) => bail!("{}\nexpected module to fail to build", context(span)), Ok(()) => bail!("{}\nexpected module to fail to build", context(span)),
Err(e) => e, Err(e) => e,
}; };
println!( let error_message = err.to_string();
"{}\nTODO: Check the assert_invalid message: {}", if !error_message.contains(&message) {
context(span), // TODO: change to bail!
message println!(
); "{}\nassert_invalid: expected {}, got {}",
drop(err); context(span),
message,
error_message
)
}
} }
AssertMalformed { AssertMalformed {
span, span,
@@ -341,12 +345,16 @@ impl WastContext {
} }
Err(e) => e, Err(e) => e,
}; };
println!( let error_message = err.to_string();
"{}\nTODO: Check the assert_malformed message: {}", if !error_message.contains(&message) {
context(span), // TODO: change to bail!
message println!(
); "{}\nassert_malformed: expected {}, got {}",
drop(err); context(span),
message,
error_message
)
}
} }
AssertUnlinkable { AssertUnlinkable {
span, span,
@@ -358,12 +366,15 @@ impl WastContext {
Ok(()) => bail!("{}\nexpected module to fail to link", context(span)), Ok(()) => bail!("{}\nexpected module to fail to link", context(span)),
Err(e) => e, Err(e) => e,
}; };
println!( let error_message = err.to_string();
"{}\nTODO: Check the assert_unlinkable message: {}", if !error_message.contains(&message) {
context(span), bail!(
message "{}\nassert_unlinkable: expected {}, got {}",
); context(span),
drop(err); message,
error_message
)
}
} }
AssertReturnFunc { .. } => panic!("need to implement assert_return_func"), AssertReturnFunc { .. } => panic!("need to implement assert_return_func"),
} }