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

Improve assertion messages in Module finalization.

Browse Source 
When an object being finalized references an object declared as needing
a definition, the definition needs to be available. Add asserts to catch
this specific case.
This commit is contained in:
Dan Gohman
2018-09-12 16:07:43 -07:00
parent 9e65b694bd
commit f2177deec1
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/module/src/module.rs
View File

@@ -263,7 +263,13 @@ where
name: &ir::ExternalName, name: &ir::ExternalName,
) -> (Option<&B::CompiledFunction>, &str, &ir::Signature) { ) -> (Option<&B::CompiledFunction>, &str, &ir::Signature) {
let info = self.contents.get_function_info(name); let info = self.contents.get_function_info(name);
debug_assert!(
!info.decl.linkage.is_definable() || info.compiled.is_some(),
"Finalization requires a definition for function {}.",
name,
);
debug_assert_eq!(info.decl.linkage.is_definable(), info.compiled.is_some()); debug_assert_eq!(info.decl.linkage.is_definable(), info.compiled.is_some());
( (
info.compiled.as_ref(), info.compiled.as_ref(),
&info.decl.name, &info.decl.name,
@@ -278,7 +284,13 @@ where
name: &ir::ExternalName, name: &ir::ExternalName,
) -> (Option<&B::CompiledData>, &str, bool) { ) -> (Option<&B::CompiledData>, &str, bool) {
let info = self.contents.get_data_info(name); let info = self.contents.get_data_info(name);
debug_assert!(
!info.decl.linkage.is_definable() || info.compiled.is_some(),
"Finalization requires a definition for data object {}.",
name,
);
debug_assert_eq!(info.decl.linkage.is_definable(), info.compiled.is_some()); debug_assert_eq!(info.decl.linkage.is_definable(), info.compiled.is_some());
(info.compiled.as_ref(), &info.decl.name, info.decl.writable) (info.compiled.as_ref(), &info.decl.name, info.decl.writable)
} }