Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Avoid legacy for set_action_return_value intrinsic - #8991

Merged
arhag merged 1 commit into
developfrom
set_action_return_value-not-legacy
Apr 23, 2020
Merged

arhag merged 1 commit into
developfrom
set_action_return_value-not-legacy

Conversation

@arhag

@arhag arhag commented Apr 22, 2020 •

Copy link
Copy Markdown
Contributor

Change Description

The set_action_return_value intrinsic is made available in a protocol feature that has not yet been released. So we are not forced to mark it as a legacy intrinsic and use legacy_span. This PR changes the set_action_return_value to use a vm::span instead.

This PR also includes a fix to a bug in preconditions.hpp that was introduced in PR #8868:

diff --git a/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp b/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp
index fe5c8a039b..42eb44ba50 100644
--- a/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp
@@ -129,7 +129,7 @@ namespace eosio { namespace chain { namespace webassembly {
                eosio::vm::invoke_on<false, eosio::vm::invoke_on_all_t>([&](auto&& narg, auto&&... nrest) {
                   using nested_arg_t = std::decay_t<decltype(arg)>;
                   if constexpr (eosio::vm::is_span_type_v<nested_arg_t> || vm::is_argument_proxy_type_v<arg_t>)
-                      EOS_ASSERT(!is_aliasing(to_span(arg), to_span(narg)), wasm_exception, "pointers not allowed to alias");
+                      EOS_ASSERT(!is_aliasing(detail::to_span(arg), detail::to_span(narg)), wasm_exception, "pointers not allowed to alias");
                }, rest...);
             }
          })));

Consensus Changes

  • Consensus Changes

API Changes

  • API Changes

Documentation Additions

  • Documentation Additions

@arhag
arhag requested a review from larryk85 April 22, 2020 23:54
@arhag
arhag merged commit df4af44 into develop Apr 23, 2020
@arhag
arhag deleted the set_action_return_value-not-legacy branch April 23, 2020 00:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants