fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-18 01:11:49 +00:00
Code Issues Projects Releases Wiki Activity

get_global can only use imported globals.

Browse Source
This commit is contained in:
Sergey Pepyakin
2017-12-04 18:00:51 +01:00
parent 251d4d68db
commit 71c9709885
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/validation/mod.rs
View File

@ -152,8 +152,15 @@ fn prepare_context(module: &Module) -> Result<ModuleContext, Error> {
}
}
if let Some(global_section) = module.global_section() {
// Validation of globals is defined over modified context C', which
// contains only imported globals. So we do globals validation
// in two passes, in first we validate globals and after all globals are validated
// add them in globals list.
for global_entry in global_section.entries() {
global_entry.validate(&globals)?;
}
for global_entry in global_section.entries() {
globals.push(global_entry.global_type().clone());
}
}

49
src/validation/tests.rs
View File

@ -82,17 +82,6 @@ fn global_init_const() {
.build();
assert!(validate_module(&m).is_ok());
// without delimiting End opcode
let m = module()
.with_global(
GlobalEntry::new(
GlobalType::new(ValueType::I32, true),
InitExpr::new(vec![Opcode::I32Const(42)])
)
)
.build();
assert!(validate_module(&m).is_err());
// init expr type differs from declared global type
let m = module()
.with_global(
@ -108,10 +97,11 @@ fn global_init_const() {
#[test]
fn global_init_global() {
let m = module()
.with_global(
GlobalEntry::new(
GlobalType::new(ValueType::I32, false),
InitExpr::new(vec![Opcode::I32Const(0), Opcode::End])
.with_import(
ImportEntry::new(
"env".into(),
"ext_global".into(),
External::Global(GlobalType::new(ValueType::I32, false))
)
)
.with_global(
@ -136,9 +126,27 @@ fn global_init_global() {
// get_global can reference only const globals
let m = module()
.with_import(
ImportEntry::new(
"env".into(),
"ext_global".into(),
External::Global(GlobalType::new(ValueType::I32, true))
)
)
.with_global(
GlobalEntry::new(
GlobalType::new(ValueType::I32, true),
InitExpr::new(vec![Opcode::GetGlobal(0), Opcode::End])
)
)
.build();
assert!(validate_module(&m).is_err());
// get_global in init_expr can only refer to imported globals.
let m = module()
.with_global(
GlobalEntry::new(
GlobalType::new(ValueType::I32, false),
InitExpr::new(vec![Opcode::I32Const(0), Opcode::End])
)
)
@ -154,6 +162,17 @@ fn global_init_global() {
#[test]
fn global_init_misc() {
// without delimiting End opcode
let m = module()
.with_global(
GlobalEntry::new(
GlobalType::new(ValueType::I32, true),
InitExpr::new(vec![Opcode::I32Const(42)])
)
)
.build();
assert!(validate_module(&m).is_err());
// empty init expr
let m = module()
.with_global(