fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-05-28 07:01:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48 from NikVolf/if_else_with_return_type_validation

Browse Source 
if_else_with_return_type_validation
This commit is contained in:
Nikolay Volf 2017-06-14 14:23:13 +03:00 committed by GitHub
commit b366a8f0c5
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/interpreter/tests/basics.rs
View File

@ -1,14 +1,16 @@
///! Basic tests for instructions/constructions, missing in wabt tests
use std::sync::Arc;
use std::sync::{Arc, Weak};
use builder::module;
use elements::{ExportEntry, Internal, ImportEntry, External, GlobalEntry, GlobalType,
InitExpr, ValueType, Opcodes, Opcode};
InitExpr, ValueType, BlockType, Opcodes, Opcode, FunctionType};
use interpreter::Error;
use interpreter::env_native::{env_native_module, UserFunction, UserFunctions, UserFunctionExecutor};
use interpreter::imports::ModuleImports;
use interpreter::memory::MemoryInstance;
use interpreter::module::{ModuleInstanceInterface, CallerContext, ItemIndex, ExecutionParams};
use interpreter::program::ProgramInstance;
use interpreter::validator::{FunctionValidationContext, Validator};
use interpreter::value::RuntimeValue;
#[test]
@ -215,3 +217,26 @@ fn single_program_different_modules() {
assert_eq!(executor.memory.get(0, 1).unwrap()[0], 42);
assert_eq!(executor.values, vec![7, 57, 42]);
}
#[test]
fn if_else_with_return_type_validation() {
let module = module().build();
let imports = ModuleImports::new(Weak::default(), None);
let mut context = FunctionValidationContext::new(&module, &imports, &[], 1024, 1024, &FunctionType::default());
Validator::validate_block(&mut context, false, BlockType::NoResult, &[
Opcode::I32Const(1),
Opcode::If(BlockType::NoResult, Opcodes::new(vec![
Opcode::I32Const(1),
Opcode::If(BlockType::Value(ValueType::I32), Opcodes::new(vec![
Opcode::I32Const(1),
Opcode::Else,
Opcode::I32Const(2),
Opcode::End,
])),
Opcode::Drop,
Opcode::End,
])),
Opcode::End,
], Opcode::End).unwrap();
}

4
src/interpreter/validator.rs
View File

@ -399,6 +399,10 @@ impl Validator {
.unwrap_or(body_len - 1);
if separator_index != body_len - 1 {
Validator::validate_block(context, false, block_type, &body[..separator_index + 1], Opcode::Else)?;
if let BlockType::Value(value_type) = block_type {
context.pop_value(value_type.into())?;
}
Validator::validate_block(context, false, block_type, &body[separator_index+1..], Opcode::End)
} else {
if block_type != BlockType::NoResult {