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

Use the more-asserts crate in more places.

Browse Source 
This provides assert_le, assert_lt, and so on, which can print the
values of the operands.
This commit is contained in:
Dan Gohman
2019-11-08 15:21:47 -08:00
parent a2b4148a91
commit 1a0ed6e388
37 changed files with 124 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/api/src/module.rs
View File

@@ -43,7 +43,7 @@ fn into_valtype(ty: &wasmparser::Type) -> ValType {
}
fn into_func_type(mt: wasmparser::FuncType) -> FuncType {
assert!(mt.form == wasmparser::Type::Func);
assert_eq!(mt.form, wasmparser::Type::Func);
let params = mt.params.iter().map(into_valtype).collect::<Vec<_>>();
let returns = mt.returns.iter().map(into_valtype).collect::<Vec<_>>();
FuncType::new(params.into_boxed_slice(), returns.into_boxed_slice())

2
crates/api/src/types.rs
View File

@@ -131,7 +131,7 @@ impl ExternType {
// Function Types
fn from_cranelift_abiparam(param: &ir::AbiParam) -> ValType {
assert!(param.purpose == ir::ArgumentPurpose::Normal);
assert_eq!(param.purpose, ir::ArgumentPurpose::Normal);
ValType::from_cranelift_type(param.value_type)
}

12
crates/api/src/wasm.rs
View File

@@ -30,7 +30,7 @@ macro_rules! declare_vec {
fn set_from_slice(&mut self, source: &[$elem_ty]) {
let mut buffer = Vec::with_capacity(source.len());
buffer.extend_from_slice(source);
assert!(buffer.len() == buffer.capacity());
assert_eq!(buffer.len(), buffer.capacity());
self.size = buffer.len();
self.data = buffer.as_mut_ptr();
mem::forget(buffer);
@@ -38,7 +38,7 @@ macro_rules! declare_vec {
#[allow(dead_code)]
fn set_buffer(&mut self, mut buffer: Vec<$elem_ty>) {
assert!(buffer.len() == buffer.capacity());
assert_eq!(buffer.len(), buffer.capacity());
self.size = buffer.len();
self.data = buffer.as_mut_ptr();
mem::forget(buffer);
@@ -65,7 +65,7 @@ macro_rules! declare_vec {
impl From<Vec<$elem_ty>> for $name {
fn from(mut vec: Vec<$elem_ty>) -> Self {
assert!(vec.len() == vec.capacity());
assert_eq!(vec.len(), vec.capacity());
let result = $name {
size: vec.len(),
data: vec.as_mut_ptr(),
@@ -95,7 +95,7 @@ macro_rules! declare_vec {
fn set_from_slice(&mut self, source: &[*mut $elem_ty]) {
let mut buffer = Vec::with_capacity(source.len());
buffer.extend_from_slice(source);
assert!(buffer.len() == buffer.capacity());
assert_eq!(buffer.len(), buffer.capacity());
self.size = buffer.len();
self.data = buffer.as_mut_ptr();
mem::forget(buffer);
@@ -103,7 +103,7 @@ macro_rules! declare_vec {
#[allow(dead_code)]
fn set_buffer(&mut self, mut buffer: Vec<*mut $elem_ty>) {
assert!(buffer.len() == buffer.capacity());
assert_eq!(buffer.len(), buffer.capacity());
self.size = buffer.len();
self.data = buffer.as_mut_ptr();
mem::forget(buffer);
@@ -132,7 +132,7 @@ macro_rules! declare_vec {
impl From<Vec<*mut $elem_ty>> for $name {
fn from(mut vec: Vec<*mut $elem_ty>) -> Self {
assert!(vec.len() == vec.capacity());
assert_eq!(vec.len(), vec.capacity());
let result = $name {
size: vec.len(),
data: vec.as_mut_ptr(),