Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace static_cast of forwarding references with std::forward #967

Merged
merged 5 commits into from
Oct 23, 2024
Merged

Replace static_cast of forwarding references with std::forward #967

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bae827
Replace `static_cast` of forwarding references with `std::forward`
greg7mdp Oct 22, 2024
6454086
update eos-vm submodule
greg7mdp Oct 22, 2024
3639734
update eos-vm submodule
greg7mdp Oct 22, 2024
7ebc6cf
update eos-vm submodule
greg7mdp Oct 23, 2024
2c689d9
Merge branch 'main' of github.com:AntelopeIO/spring into move_correct…
greg7mdp Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/chain/webassembly/runtimes/eos-vm-oc/executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

extern "C" int arch_prctl(int code, unsigned long* addr);

namespace eosio { namespace chain { namespace eosvmoc {
namespace eosio::chain::eosvmoc {

static constexpr auto signal_sentinel = 0x4D56534F45534559ul;

Expand Down Expand Up @@ -265,4 +265,4 @@ executor::~executor() {
munmap(code_mapping, code_mapping_size);
}

}}}
}
8 changes: 4 additions & 4 deletions libraries/chain/webassembly/runtimes/eos-vm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace {
template<typename F>
struct guard {
guard(transaction_checktime_timer& timer, F&& func)
: _timer(timer), _func(static_cast<F&&>(func)) {
: _timer(timer), _func(std::forward<F>(func)) {
_timer.set_expiration_callback(&callback, this);
if(_timer.expired) {
_func(); // it's harmless if _func is invoked twice
Expand All @@ -45,7 +45,7 @@ namespace {
};
template<typename F>
guard<F> scoped_run(F&& func) {
return guard{_timer, static_cast<F&&>(func)};
return guard{_timer, std::forward<F>(func)};
}
transaction_checktime_timer& _timer;
};
Expand Down Expand Up @@ -158,7 +158,7 @@ class eos_vm_instantiated_module : public wasm_instantiated_module_interface {
};
try {
checktime_watchdog wd(context.trx_context.transaction_timer);
_runtime->_bkend.timed_run(wd, fn);
_runtime->_bkend.timed_run(std::move(wd), std::move(fn));
} catch(eosio::vm::timeout_exception&) {
context.trx_context.checktime();
} catch(eosio::vm::wasm_memory_exception& e) {
Expand Down Expand Up @@ -202,7 +202,7 @@ class eos_vm_profiling_module : public wasm_instantiated_module_interface {
try {
scoped_profile profile_runner(prof);
checktime_watchdog wd(context.trx_context.transaction_timer);
_instantiated_module->timed_run(wd, fn);
_instantiated_module->timed_run(std::move(wd), std::move(fn));
} catch(eosio::vm::timeout_exception&) {
context.trx_context.checktime();
} catch(eosio::vm::wasm_memory_exception& e) {
Expand Down
2 changes: 1 addition & 1 deletion libraries/eos-vm
Open in desktop
Submodule eos-vm updated 8 files
+22 −22 include/eosio/vm/backend.hpp
+13 −13 include/eosio/vm/execution_context.hpp
+1 −1 include/eosio/vm/function_traits.hpp
+7 −7 include/eosio/vm/host_function.hpp
+1 −1 include/eosio/vm/utils.hpp
+9 −9 include/eosio/vm/variant.hpp
+2 −2 include/eosio/vm/watchdog.hpp
+1 −1 tools/interp.cpp
Loading