Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/checkout-4
Browse files Browse the repository at this point in the history
  • Loading branch information
@athei
athei authored Nov 7, 2023
2 parents 3d29fac + fd3b1f8 commit 1468b7c
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 129 deletions.
2 changes: 1 addition & 1 deletion src/gas_metering/backend.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ pub mod mutable_global {
cost.saturating_add(rules.instruction_cost(instruction).unwrap_or(u32::MAX).into())
});
// don't charge for the instructions used to fail when out of gas
let fail_cost = vec![
let fail_cost = [
Instruction::I64Const(-1i64), // non-charged instruction
Instruction::SetGlobal(gas_global_idx), // non-charged instruction
Instruction::Unreachable, // non-charged instruction
Expand Down
150 changes: 75 additions & 75 deletions src/gas_metering/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,12 @@ pub fn inject<R: Rules, B: Backend>(
///
/// An example of block:
///
/// ```ignore
/// ```wasm
/// loop
/// i32.const 1
/// get_local 0
/// local.get 0
/// i32.sub
/// tee_local 0
/// local.tee 0
/// br_if 0
/// end
/// ```
Expand Down Expand Up @@ -1082,13 +1082,13 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 1))
(get_global 0)))
(global.get 0)))
"#
}

Expand All @@ -1097,23 +1097,23 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(block
(get_global 0)
(get_global 0)
(get_global 0))
(get_global 0)))
(global.get 0)
(global.get 0)
(global.get 0))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 6))
(get_global 0)
(global.get 0)
(block
(get_global 0)
(get_global 0)
(get_global 0))
(get_global 0)))
(global.get 0)
(global.get 0)
(global.get 0))
(global.get 0)))
"#
}

Expand All @@ -1122,33 +1122,33 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(if
(then
(get_global 0)
(get_global 0)
(get_global 0))
(global.get 0)
(global.get 0)
(global.get 0))
(else
(get_global 0)
(get_global 0)))
(get_global 0)))
(global.get 0)
(global.get 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 3))
(get_global 0)
(global.get 0)
(if
(then
(call 0 (i64.const 3))
(get_global 0)
(get_global 0)
(get_global 0))
(global.get 0)
(global.get 0)
(global.get 0))
(else
(call 0 (i64.const 2))
(get_global 0)
(get_global 0)))
(get_global 0)))
(global.get 0)
(global.get 0)))
(global.get 0)))
"#
}

Expand All @@ -1157,28 +1157,28 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(block
(get_global 0)
(global.get 0)
(drop)
(br 0)
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 6))
(get_global 0)
(global.get 0)
(block
(get_global 0)
(global.get 0)
(drop)
(br 0)
(call 0 (i64.const 2))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#
}

Expand All @@ -1187,37 +1187,37 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(block
(get_global 0)
(global.get 0)
(if
(then
(get_global 0)
(get_global 0)
(global.get 0)
(global.get 0)
(drop)
(br_if 1)))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 5))
(get_global 0)
(global.get 0)
(block
(get_global 0)
(global.get 0)
(if
(then
(call 0 (i64.const 4))
(get_global 0)
(get_global 0)
(global.get 0)
(global.get 0)
(drop)
(br_if 1)))
(call 0 (i64.const 2))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#
}

Expand All @@ -1226,44 +1226,44 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(loop
(get_global 0)
(global.get 0)
(if
(then
(get_global 0)
(global.get 0)
(br_if 0))
(else
(get_global 0)
(get_global 0)
(global.get 0)
(global.get 0)
(drop)
(br_if 1)))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 3))
(get_global 0)
(global.get 0)
(loop
(call 0 (i64.const 4))
(get_global 0)
(global.get 0)
(if
(then
(call 0 (i64.const 2))
(get_global 0)
(global.get 0)
(br_if 0))
(else
(call 0 (i64.const 4))
(get_global 0)
(get_global 0)
(global.get 0)
(global.get 0)
(drop)
(br_if 1)))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#
}

Expand All @@ -1272,23 +1272,23 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(if
(then
(return)))
(get_global 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 2))
(get_global 0)
(global.get 0)
(if
(then
(call 0 (i64.const 1))
(return)))
(call 0 (i64.const 1))
(get_global 0)))
(global.get 0)))
"#
}

Expand All @@ -1297,23 +1297,23 @@ mod tests {
input = r#"
(module
(func (result i32)
(get_global 0)
(global.get 0)
(block
(get_global 0)
(global.get 0)
(if
(then (br 1))
(else (br 0)))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#;
expected = r#"
(module
(func (result i32)
(call 0 (i64.const 5))
(get_global 0)
(global.get 0)
(block
(get_global 0)
(global.get 0)
(if
(then
(call 0 (i64.const 1))
Expand All @@ -1322,9 +1322,9 @@ mod tests {
(call 0 (i64.const 1))
(br 0)))
(call 0 (i64.const 2))
(get_global 0)
(global.get 0)
(drop))
(get_global 0)))
(global.get 0)))
"#
}

Expand Down
2 changes: 1 addition & 1 deletion src/stack_limiter/max_height.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ mod tests {
(memory 0)
(func (result i32)
unreachable
grow_memory
memory.grow
)
)
"#,
Expand Down
14 changes: 7 additions & 7 deletions src/stack_limiter/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,17 @@ fn instrument_functions(
/// Before:
///
/// ```text
/// get_local 0
/// get_local 1
/// local.get 0
/// local.get 1
/// call 228
/// drop
/// ```
///
/// After:
///
/// ```text
/// get_local 0
/// get_local 1
/// local.get 0
/// local.get 1
///
/// < ... preamble ... >
///
Expand Down Expand Up @@ -366,9 +366,9 @@ mod tests {
r#"
(module
(func (export "i32.add") (param i32 i32) (result i32)
get_local 0
get_local 1
i32.add
local.get 0
local.get 1
i32.add
)
)
"#,
Expand Down
6 changes: 1 addition & 5 deletions src/stack_limiter/thunk.rs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
#[cfg(not(features = "std"))]
use alloc::collections::BTreeMap as Map;
use alloc::vec::Vec;
use alloc::{collections::BTreeMap as Map, vec::Vec};
use parity_wasm::{
builder,
elements::{self, FunctionType, Internal},
};
#[cfg(features = "std")]
use std::collections::HashMap as Map;

use super::{resolve_func_type, Context};

Expand Down
Loading

0 comments on commit 1468b7c

Please sign in to comment.