Skip to content

Commit 2323ad8

Browse files
authored
Merge pull request #438 from wasmx/execute_noexcept
Execute noexcept
2 parents e8568f7 + e2811aa commit 2323ad8

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

lib/fizzy/execute.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ void branch(const Code& code, OperandStack& stack, const Instr*& pc, const uint8
271271
}
272272

273273
template <class F>
274-
bool invoke_function(
275-
const FuncType& func_type, const F& func, Instance& instance, OperandStack& stack, int depth)
274+
bool invoke_function(const FuncType& func_type, const F& func, Instance& instance,
275+
OperandStack& stack, int depth) noexcept
276276
{
277277
const auto num_args = func_type.inputs.size();
278278
assert(stack.size() >= num_args);
@@ -296,9 +296,9 @@ bool invoke_function(
296296
}
297297

298298
inline bool invoke_function(const FuncType& func_type, uint32_t func_idx, Instance& instance,
299-
OperandStack& stack, int depth)
299+
OperandStack& stack, int depth) noexcept
300300
{
301-
const auto func = [func_idx](Instance& _instance, span<const Value> args, int _depth) {
301+
const auto func = [func_idx](Instance& _instance, span<const Value> args, int _depth) noexcept {
302302
return execute(_instance, func_idx, args, _depth);
303303
};
304304
return invoke_function(func_type, func, instance, stack, depth);
@@ -801,7 +801,8 @@ std::unique_ptr<Instance> instantiate(Module module,
801801
return instance;
802802
}
803803

804-
ExecutionResult execute(Instance& instance, FuncIdx func_idx, span<const Value> args, int depth)
804+
ExecutionResult execute(
805+
Instance& instance, FuncIdx func_idx, span<const Value> args, int depth) noexcept
805806
{
806807
assert(depth >= 0);
807808
if (depth > CallStackLimit)

lib/fizzy/execute.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ std::unique_ptr<Instance> instantiate(Module module,
105105

106106
// Execute a function on an instance.
107107
ExecutionResult execute(
108-
Instance& instance, FuncIdx func_idx, span<const Value> args, int depth = 0);
108+
Instance& instance, FuncIdx func_idx, span<const Value> args, int depth = 0) noexcept;
109109

110110
inline ExecutionResult execute(
111-
Instance& instance, FuncIdx func_idx, std::initializer_list<Value> args)
111+
Instance& instance, FuncIdx func_idx, std::initializer_list<Value> args) noexcept
112112
{
113113
return execute(instance, func_idx, span<const Value>{args});
114114
}

0 commit comments

Comments
 (0)