From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Mon, 24 Apr 2023 01:35:54 +0000 (-0500)
Subject: bugfix: old js code; `Optional.from_ptr`
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=dd79df6934d00ec72e414e489b5294a1da48c867;p=onyx.git

bugfix: old js code; `Optional.from_ptr`
---

diff --git a/bin/onyx-loader.js b/bin/onyx-loader.js
index 011fc248..127b0e3d 100644
--- a/bin/onyx-loader.js
+++ b/bin/onyx-loader.js
@@ -15,7 +15,7 @@ window.ONYX_MODULES.push({
 
     exit: function() { debugger; },
 
-    spawn_thread: function(id, tls_base, stack_base, funcidx, dataptr) {
+    spawn_thread: function(id, tls_base, stack_base, funcidx, closureptr, closuresize, dataptr) {
         try {
             let needed_imports = {};
 
@@ -31,14 +31,16 @@ window.ONYX_MODULES.push({
 
             window.ONYX_WORKERS[id] = new Worker(window.ONYX_THREAD_SCRIPT);
             window.ONYX_WORKERS[id].postMessage({
-                thread_id  : id,
-                memory     : window.ONYX_MEMORY,
-                wasm_bytes : window.ONYX_BYTES,
-                funcidx    : funcidx,
-                dataptr    : dataptr,
-                imports    : needed_imports,
-                tls_base   : tls_base,
-                stack_base : stack_base
+                thread_id   : id,
+                memory      : window.ONYX_MEMORY,
+                wasm_bytes  : window.ONYX_BYTES,
+                funcidx     : funcidx,
+                closureptr  : closureptr,
+                closuresize : closuresize,
+                dataptr     : dataptr,
+                imports     : needed_imports,
+                tls_base    : tls_base,
+                stack_base  : stack_base
             });
 
             return 1;
diff --git a/bin/onyx-thread.js b/bin/onyx-thread.js
index d23f7707..e1426985 100644
--- a/bin/onyx-thread.js
+++ b/bin/onyx-thread.js
@@ -32,7 +32,7 @@ self.onmessage = function (msg) {
     .then(function(res) {
         self.ONYX_MEMORY = data.memory;
 
-        res.instance.exports._thread_start(data.thread_id, data.tls_base, data.stack_base, data.funcidx, data.dataptr);
+        res.instance.exports._thread_start(data.thread_id, data.tls_base, data.stack_base, data.funcidx, data.closureptr, data.closuresize, data.dataptr);
         res.instance.exports._thread_exit(data.thread_id);
     });
 ,
diff --git a/core/container/optional.onyx b/core/container/optional.onyx
index 35ad5d4f..6da427af 100644
--- a/core/container/optional.onyx
+++ b/core/container/optional.onyx
@@ -35,7 +35,8 @@ package core
         pointer to return the data stored at the pointer's address.
     """
     from_ptr :: macro (p: &$T) -> ?T {
-        if p do return *p;
+        p_ := p;
+        if p_ do return *p_;
         return .{};
     }