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

[4.0 -> main] Merge memory issue fix from release/4.0 to main #1398

Merged
merged 8 commits into from
Jul 12, 2023
Merged

[4.0 -> main] Merge memory issue fix from release/4.0 to main #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7bcebca
A companion Leap changes for fixing WASM memory exhaustion
linh2931 Jul 1, 2023
c8327b5
update eos-vm to point to release/3x
linh2931 Jul 12, 2023
3e576c5
Merge pull request #1393 from AntelopeIO/memory_issue_fix
linh2931 Jul 12, 2023
6ec530e
Merge remote-tracking branch 'origin/release/3.1' into merge_memory_i…
linh2931 Jul 12, 2023
6beea8a
Merge pull request #1394 from AntelopeIO/merge_memory_issue_fix_from_3_1
linh2931 Jul 12, 2023
2986df8
update eos-vm to point to release/4.0
linh2931 Jul 12, 2023
6558f99
Merge pull request #1397 from AntelopeIO/merge_memory_issue_fix_from_3_2
linh2931 Jul 12, 2023
273e378
update eos-vm to point to main
linh2931 Jul 12, 2023
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.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ std::unique_ptr<wasm_instantiated_module_interface> eos_vm_runtime<Impl>::instan
wasm_code_ptr code((uint8_t*)code_bytes, code_size);
apply_options options = { .max_pages = 65536,
.max_call_depth = 0 };
std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size, nullptr, options);
std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size, nullptr, options, false); // uses 2-passes parsing
eos_vm_host_functions_t::resolve(bkend->get_module());
return std::make_unique<eos_vm_instantiated_module<Impl>>(this, std::move(bkend));
} catch(eosio::vm::exception& e) {
Expand All @@ -264,7 +264,7 @@ std::unique_ptr<wasm_instantiated_module_interface> eos_vm_profile_runtime::inst
wasm_code_ptr code((uint8_t*)code_bytes, code_size);
apply_options options = { .max_pages = 65536,
.max_call_depth = 0 };
std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size, nullptr, options);
std::unique_ptr<backend_t> bkend = std::make_unique<backend_t>(code, code_size, nullptr, options, false); // uses 2-passes parsing
eos_vm_host_functions_t::resolve(bkend->get_module());
return std::make_unique<eos_vm_profiling_module>(std::move(bkend), code_bytes, code_size);
} catch(eosio::vm::exception& e) {
Expand Down
2 changes: 1 addition & 1 deletion libraries/eos-vm
Open in desktop
Submodule eos-vm updated 9 files
+78 −32 include/eosio/vm/allocator.hpp
+49 −7 include/eosio/vm/backend.hpp
+6 −1 include/eosio/vm/constants.hpp
+4 −0 include/eosio/vm/execution_context.hpp
+32 −6 include/eosio/vm/parser.hpp
+1 −1 include/eosio/vm/types.hpp
+11 −0 include/eosio/vm/wasm_stack.hpp
+8 −7 include/eosio/vm/x86_64.hpp
+59 −0 tests/allocator_tests.cpp