Merge pull request #1394 from AntelopeIO/merge_memory_issue_fix_from_3_1

[3.1 -> 3.2] Merge memory issue fix from release/3.1
AntelopeIO · Jul 12, 2023 · 6beea8a · 6beea8a
2 parents 4c1226e + 6ec530e
commit 6beea8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libraries/chain/webassembly/runtimes/eos-vm.cpp b/libraries/chain/webassembly/runtimes/eos-vm.cpp
@@ -247,7 +247,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) {
@@ -273,7 +273,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) {

diff --git a/libraries/eos-vm b/libraries/eos-vm
+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