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

rename

Browse Source
This commit is contained in:
Pat Hickey
2021-10-20 16:32:39 -07:00
parent 18a355e092
commit 147c8f8ed7
4 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/runtime/src/memory.rs
View File

@@ -315,7 +315,7 @@ impl Memory {
// calculation overflowed. This means that the `minimum` we're informing
// the limiter is lossy and may not be 100% accurate, but for now the
// expected uses of limiter means that's ok.
if !store.limiter_memory_growing(0, minimum.unwrap_or(absolute_max), maximum) {
if !store.memory_growing(0, minimum.unwrap_or(absolute_max), maximum) {
bail!(
"memory minimum size of {} pages exceeds memory limits",
plan.memory.minimum
@@ -402,14 +402,14 @@ impl Memory {
let maximum = self.maximum_byte_size();
// Store limiter gets first chance to reject memory_growing.
if !store.limiter_memory_growing(old_byte_size, new_byte_size, maximum) {
if !store.memory_growing(old_byte_size, new_byte_size, maximum) {
return None;
}
// Never exceed maximum, even if limiter permitted it.
if let Some(max) = maximum {
if new_byte_size > max {
store.limiter_memory_grow_failed(&format_err!("Memory maximum size exceeded"));
store.memory_grow_failed(&format_err!("Memory maximum size exceeded"));
return None;
}
}
@@ -431,7 +431,7 @@ impl Memory {
} => {
// Never exceed static memory size
if new_byte_size > base.len() {
store.limiter_memory_grow_failed(&format_err!("static memory size exceeded"));
store.memory_grow_failed(&format_err!("static memory size exceeded"));
return None;
}
@@ -440,13 +440,13 @@ impl Memory {
base.as_mut_ptr().add(old_byte_size),
new_byte_size - old_byte_size,
);
r.map_err(|e| store.limiter_memory_grow_failed(&e)).ok()?;
r.map_err(|e| store.memory_grow_failed(&e)).ok()?;
*size = new_byte_size;
}
Memory::Dynamic(mem) => {
let r = mem.grow_to(new_byte_size);
r.map_err(|e| store.limiter_memory_grow_failed(&e)).ok()?;
r.map_err(|e| store.memory_grow_failed(&e)).ok()?;
}
}
Some(old_byte_size)