Forward port changes from v0.6 release branch

Merge fixes from release-0.6 branch, such as memory corruption with
erlang:make_tuple/2, emscripten tests and release step, advanced tracing
build and improve valgrind CI step.

Author: bettio

.github/workflows/build-and-test.yaml

@@ -367,37 +367,37 @@ jobs:
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./tests/test-erlang -s prime_smp
         ./tests/test-erlang -s prime_smp
-        valgrind ./tests/test-erlang -s prime_smp
 
     - name: "Test: test-enif"
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./tests/test-enif
         ./tests/test-enif
-        valgrind ./tests/test-enif
 
     - name: "Test: test-heap"
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./tests/test-heap
         ./tests/test-heap
-        valgrind ./tests/test-heap
 
     - name: "Test: test-mailbox"
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./tests/test-mailbox
         ./tests/test-mailbox
-        valgrind ./tests/test-mailbox
 
     - name: "Test: test-structs"
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./tests/test-structs
         ./tests/test-structs
-        valgrind ./tests/test-structs
 
     - name: "Test: test_etest.avm"
       timeout-minutes: 5
@@ -412,24 +412,24 @@ jobs:
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
         ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
-        valgrind ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
 
     - name: "Test: test_eavmlib.avm"
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/eavmlib/test_eavmlib.avm
         ./src/AtomVM ./tests/libs/eavmlib/test_eavmlib.avm
-        valgrind ./src/AtomVM ./tests/libs/eavmlib/test_eavmlib.avm
 
     - name: "Test: test_alisp.avm"
       timeout-minutes: 10
       working-directory: build
       run: |
         ulimit -c unlimited
+        valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
         ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
-        valgrind ./src/AtomVM ./tests/libs/alisp/test_alisp.avm
 
     - name: "Test: Tests.avm (Elixir)"
       timeout-minutes: 10
@@ -438,8 +438,8 @@ jobs:
         ulimit -c unlimited
         if command -v elixirc &> /dev/null
         then
+          valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
           ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
-          valgrind ./src/AtomVM ./tests/libs/exavmlib/Tests.avm
         fi
 
     - name: "Install and smoke test"

.github/workflows/build-libraries.yaml

@@ -89,8 +89,8 @@ jobs:
       timeout-minutes: 10
       working-directory: build
       run: |
+        valgrind --error-exitcode=1 ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
         ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
-        valgrind ./src/AtomVM ./tests/libs/estdlib/test_estdlib.avm
 
     - name: "Rename and write sha256sum"
       working-directory: build

.github/workflows/wasm-build.yaml

@@ -124,9 +124,6 @@ jobs:
         ATOMVM_JS=AtomVM-node-${{ github.ref_name }}.js
         mv AtomVM.js "${ATOMVM_JS}"
         sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256"
-        ATOMVM_WORKER_JS=AtomVM.worker-node-${{ github.ref_name }}.js
-        mv AtomVM.worker.js "${ATOMVM_WORKER_JS}"
-        sha256sum "${ATOMVM_WORKER_JS}" > "${ATOMVM_WORKER_JS}.sha256"
         ATOMVM_WASM=AtomVM-node-${{ github.ref_name }}.wasm
         mv AtomVM.wasm "${ATOMVM_WASM}"
         sha256sum "${ATOMVM_WASM}" > "${ATOMVM_WASM}.sha256"
@@ -140,8 +137,6 @@ jobs:
         files: |
           src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.js
           src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.js.sha256
-          src/platforms/emscripten/build/src/AtomVM.worker-node-${{ github.ref_name }}.js
-          src/platforms/emscripten/build/src/AtomVM.worker-node-${{ github.ref_name }}.js.sha256
           src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.wasm
           src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.wasm.sha256
 
@@ -227,9 +222,6 @@ jobs:
         ATOMVM_JS=AtomVM-web-${{ github.ref_name }}.js
         mv AtomVM.js "${ATOMVM_JS}"
         sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256"
-        ATOMVM_WORKER_JS=AtomVM.worker-web-${{ github.ref_name }}.js
-        mv AtomVM.worker.js "${ATOMVM_WORKER_JS}"
-        sha256sum "${ATOMVM_WORKER_JS}" > "${ATOMVM_WORKER_JS}.sha256"
         ATOMVM_WASM=AtomVM-web-${{ github.ref_name }}.wasm
         mv AtomVM.wasm "${ATOMVM_WASM}"
         sha256sum "${ATOMVM_WASM}" > "${ATOMVM_WASM}.sha256"
@@ -243,7 +235,5 @@ jobs:
         files: |
           src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.js
           src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.js.sha256
-          src/platforms/emscripten/build/src/AtomVM.worker-web-${{ github.ref_name }}.js
-          src/platforms/emscripten/build/src/AtomVM.worker-web-${{ github.ref_name }}.js.sha256
           src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.wasm
           src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.wasm.sha256

CHANGELOG.md

@@ -85,6 +85,7 @@ memory error
 - Fixed possible concurrency problems in ESP32 UART driver
 - Fixed concurrency and memory leak related to links and monitors
 - Fixed issues with parsing of line references for stack traces
+- Fixed memory corruption issue with `erlang:make_tuple/2`
 
 ### Changed
 

examples/emscripten/run_script.erl

@@ -22,8 +22,14 @@
 -export([start/0]).
 
 start() ->
-    CounterPid = spawn(fun() -> counter_loop() end),
-    emscripten:run_script(<<"alert('hello from Erlang in main thread')">>, [main_thread]),
+    {CounterPid, CounterMonitor} = spawn_opt(fun() -> counter_loop() end, [monitor]),
+    emscripten:run_script(
+        <<
+            "console.log('hello from Erlang in main thread');"
+            "alert('hello from Erlang in main thread')"
+        >>,
+        [main_thread]
+    ),
     CounterPid ! {self(), terminate},
     receive
         {CounterPid, CounterValue, DeltaMS} ->
@@ -40,15 +46,20 @@ start() ->
                 ]
             )
     end,
-    emscripten:run_script(<<"alert('hello from Erlang in main thread async')">>, [
-        main_thread, async
-    ]),
-    emscripten:run_script(<<"alert('hello from Erlang in worker thread')">>),
+    % Ensure process terminated
+    receive
+        {'DOWN', CounterMonitor, process, CounterPid, normal} -> ok
+    end,
     emscripten:run_script(
-        <<"window.document.getElementById('demo-not').style = 'display: none';">>, [
-            main_thread
+        <<
+            "console.log('hello from Erlang in main thread async');"
+            "alert('hello from Erlang in main thread async')"
+        >>,
+        [
+            main_thread, async
         ]
-    ).
+    ),
+    emscripten:run_script(<<"console.log('hello from Erlang in worker thread')">>).
 
 counter_loop() ->
     StartTimeMS = erlang:system_time(millisecond),

examples/emscripten/run_script.html

@@ -30,29 +30,26 @@ <h1>Run script example</h1>
       <code>emscripten:run_script/2</code> to run Javascript from Erlang.
     </p>
 
-    <p>It displays three alerts:</p>
+    <p>It runs four Javascript scripts:</p>
     <ul>
-      <li>An alert in the main thread, synchronously</li>
-      <li>An alert in the main thread, asynchronously</li>
-      <li>An alert in the worker thread</li>
+      <li>One script from the main thread, synchronously, that prints a line to the console and displays an alert</li>
+      <li>One script from the main thread, asynchronously, that prints a line to the console and displays an alert</li>
+      <li>One script from the worker thread that prints a line to the console</li>
+      <li>One script that updates the DOM to display the time required for first script to run</li>
     </ul>
-    <p>Second alert is likely to appear after third alert.</p>
 
     <p>
       On non-SMP builds, it demonstrates the fact that Erlang continues to run
       when <code>emscripten:run_script/2</code> is called with
       <code>[main_thread]</code> as a counter is incremented while waiting for
-      first alert to complete. The value is <span id="demo-counter">unset</span>
+      first line to be printed. The value is <span id="demo-counter">unset</span>
     </p>
 
     <p>
       Beyond the counter, this example also demonstrates manipulating DOM (in
       the main thread) using JS function.
     </p>
 
-    <p>
-      Style of this text was <span id="demo-not">not</span> modified by Erlang.
-    </p>
     <script>
       // Arguments are loaded using fetch API.
       // wasm_webserver serves under /build/ files in build subdirectory.

src/libAtomVM/module.h

@@ -160,7 +160,7 @@ enum ModuleLoadResult
  * @param module_atom module name atom string.
  * @param function_atom function name atom string.
  */
-void module_get_imported_function_module_and_name(const Module *this_module, int index, AtomString *module_atom, AtomString *function_atom);
+void module_get_imported_function_module_and_name(const Module *this_module, int index, AtomString *module_atom, AtomString *function_atom, GlobalContext *glb);
 #endif
 
 /**

src/libAtomVM/nifs.c

@@ -1710,7 +1710,7 @@ static term nif_erlang_make_tuple_2(Context *ctx, int argc, term argv[])
         RAISE_ERROR(BADARG_ATOM);
     }
 
-    if (UNLIKELY(memory_ensure_free_opt(ctx, count_elem + 1, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+    if (UNLIKELY(memory_ensure_free_with_roots(ctx, TUPLE_SIZE(count_elem), 1, argv + 1, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
         RAISE_ERROR(OUT_OF_MEMORY_ATOM);
     }
     term new_tuple = term_alloc_tuple(count_elem, &ctx->heap);

src/libAtomVM/opcodesswitch.h

@@ -1696,7 +1696,7 @@ static bool maybe_call_native(Context *ctx, AtomString module_name, AtomString f
         if (UNLIKELY(ctx->trace_calls)) {
             AtomString module_name;
             AtomString function_name;
-            module_get_imported_function_module_and_name(mod, index, &module_name, &function_name);
+            module_get_imported_function_module_and_name(mod, index, &module_name, &function_name, ctx->global);
             trace_apply(ctx, call_type, module_name, function_name, arity);
         }
     }

src/platforms/emscripten/tests/cypress/e2e/examples.spec.cy.js

@@ -57,23 +57,38 @@ describe("emscripten hello world BEAM", () => {
 
 describe("emscripten run script", () => {
   it("should display three alerts and update counter", () => {
+    cy.visit("/run_script.html", {
+      onBeforeLoad(win) {
+        cy.stub(win.console, "log").as("consoleLog");
+      },
+    });
     const alert = cy.stub().as("alert");
     cy.on("window:alert", alert);
-    cy.visit("/run_script.html");
     cy.get("#demo-counter").should("contain", "unset");
-    cy.get("@alert").should(
+    cy.get("@consoleLog").should(
       "have.been.calledWith",
       "hello from Erlang in main thread",
     );
     cy.get("@alert").should(
-      "have.been.calledWithMatch",
-      "hello from Erlang in worker thread",
+      "have.been.calledWith",
+      "hello from Erlang in main thread",
+    );
+// window.console is not the console invoked by our code from worker
+// thread, or at least cypress stub doesn't work
+//  cy.get("@consoleLog").should(
+//    "have.been.calledWithMatch",
+//    "hello from Erlang in worker thread",
+//  );
+    cy.get("@consoleLog").should(
+      "have.been.calledWith",
+      "hello from Erlang in main thread async",
     );
     cy.get("@alert").should(
       "have.been.calledWith",
       "hello from Erlang in main thread async",
     );
     cy.get("#demo-counter").should("contain", "ms");
+    cy.get("@consoleLog").should("be.calledWith", "Return value: ok");
   });
 });