fix(jerryscript): track native holders to ensure cleanup

Author: alandefreitas

.github/workflows/ci.yml

@@ -97,6 +97,7 @@ jobs:
             mrdocs-release-package-artifact: release-packages-{{{ lowercase os }}}
           output-file: matrix.json
           trace-commands: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Set up the version as expected by the LLVM matrix script and @actions/core
       - name: Setup Node.js

src/lib/Support/JavaScript.cpp

@@ -83,6 +83,7 @@
 #include <string>
 #include <string_view>
 #include <thread>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -459,6 +460,21 @@ struct Context::Impl {
     // Optional diagnostics: track live JS handles we create (Value copies etc).
     std::atomic<int> live_handles{0};
 
+    // Track all native holders (DomValueHolder, FunctionHolder) so we can
+    // delete them during cleanup if JerryScript's GC doesn't finalize them.
+    // This handles the case where objects are still referenced from globals.
+    std::unordered_set<NativeHolder*> holders;
+
+    void registerHolder(NativeHolder* h)
+    {
+        holders.insert(h);
+    }
+
+    void unregisterHolder(NativeHolder* h)
+    {
+        holders.erase(h);
+    }
+
     Impl()
     {
         // Temporarily set TLS so jerry_init() can find the context.
@@ -531,10 +547,8 @@ struct Context::Impl {
         void* prev_ctx = get_tls_jerry_context();
         set_tls_jerry_context(jerry_ctx);
 
-        // Run full garbage collection to finalize all objects and trigger
-        // native pointer free callbacks (DomValueHolder::free_cb, etc.)
-        // before jerry_cleanup(). This ensures all our native holders are
-        // properly deleted.
+        // Run full garbage collection to finalize unreferenced objects and
+        // trigger native pointer free callbacks (DomValueHolder::free_cb, etc.)
         jerry_heap_gc(JERRY_GC_PRESSURE_HIGH);
 
         // jerry_cleanup() cleans up JS objects but with JERRY_EXTERNAL_CONTEXT=ON,
@@ -545,6 +559,16 @@ struct Context::Impl {
         // jerry_port_context_free is our implementation that calls std::free().
         jerry_port_context_free(jerry_ctx, 0);
 
+        // Delete any remaining native holders that weren't garbage collected.
+        // This handles objects still referenced from globals at cleanup time.
+        // The free_cb won't be called for these since JerryScript just abandons
+        // them during cleanup, so we delete them manually.
+        for (NativeHolder* h : holders)
+        {
+            delete h;
+        }
+        holders.clear();
+
         // Context is now destroyed. Set jerry_ctx to nullptr and mark dead.
         jerry_ctx = nullptr;
         alive = false;
@@ -568,6 +592,11 @@ struct Context::Impl {
 void DomValueHolder::free_cb(void* p, jerry_object_native_info_t*)
 {
     auto* h = static_cast<DomValueHolder*>(p);
+    // Always unregister from tracking set so we don't double-free during cleanup.
+    if (h->impl)
+    {
+        h->impl->unregisterHolder(h);
+    }
     delete h;
 }
 
@@ -1634,6 +1663,7 @@ makeObjectProxy(dom::Object obj, std::shared_ptr<Context::Impl> impl)
     auto* holder = new DomValueHolder();
     holder->impl = impl;
     holder->value = dom::Value(std::move(obj));
+    impl->registerHolder(holder);
 
     // Create an empty target object (the proxy intercepts all access)
     jerry_value_t target = jerry_object();
@@ -1804,6 +1834,11 @@ struct FunctionHolder : NativeHolder {
     free_cb(void* p, jerry_object_native_info_t*)
     {
         auto* h = static_cast<FunctionHolder*>(p);
+        // Always unregister from tracking set so we don't double-free during cleanup.
+        if (h->impl)
+        {
+            h->impl->unregisterHolder(h);
+        }
         delete h;
     }
 };
@@ -1818,6 +1853,7 @@ makeFunctionProxy(dom::Function fn, std::shared_ptr<Context::Impl> impl)
     auto* holder = new FunctionHolder();
     holder->impl = impl;
     holder->fn = std::move(fn);
+    impl->registerHolder(holder);
 
     jerry_value_t func = jerry_function_external(
         [](jerry_call_info_t const* call_info_p,