1 files changed, 18 insertions, 11 deletions
diff --git a/src/javascript/jsc/bindings/BunClientData.cpp b/src/javascript/jsc/bindings/BunClientData.cpp
index 807525a21..2cdd8b25a 100644
--- a/src/javascript/jsc/bindings/BunClientData.cpp
+++ b/src/javascript/jsc/bindings/BunClientData.cpp
@@ -14,21 +14,23 @@
 #include "wtf/MainThread.h"
 
 #include "JSDOMConstructorBase.h"
+#include "JSDOMBuiltinConstructorBase.h"
 
 #include "BunGCOutputConstraint.h"
 #include "WebCoreTypedArrayController.h"
-#include "JavaScriptCore/AbstractSlotVisitorInlines.h"
-#include "JavaScriptCore/JSCellInlines.h"
-#include "JavaScriptCore/WeakInlines.h"
+#include "JavaScriptCore/JSCInlines.h"
+
+#include "JSDOMWrapper.h"
 
 namespace WebCore {
 using namespace JSC;
 
 JSHeapData::JSHeapData(Heap& heap)
-    // : m_domNamespaceObjectSpace ISO_SUBSPACE_INIT(heap, heap.cellHeapCellType, JSDOMObject)
-    // ,
-    : m_subspaces(makeUnique<ExtendedDOMIsoSubspaces>())
+    : m_heapCellTypeForJSWorkerGlobalScope(JSC::IsoHeapCellType::Args<Zig::GlobalObject>())
+    , m_domBuiltinConstructorSpace ISO_SUBSPACE_INIT(heap, heap.cellHeapCellType, JSDOMBuiltinConstructorBase)
     , m_domConstructorSpace ISO_SUBSPACE_INIT(heap, heap.cellHeapCellType, JSDOMConstructorBase)
+    , m_domNamespaceObjectSpace ISO_SUBSPACE_INIT(heap, heap.cellHeapCellType, JSDOMObject)
+    , m_subspaces(makeUnique<ExtendedDOMIsoSubspaces>())
 
 {
 }
@@ -36,11 +38,14 @@ JSHeapData::JSHeapData(Heap& heap)
 #define CLIENT_ISO_SUBSPACE_INIT(subspace) subspace(m_heapData->subspace)
 
 JSVMClientData::JSVMClientData(VM& vm)
-    : m_builtinNames(vm)
+    : m_builtinFunctions(vm)
+    , m_builtinNames(vm)
     , m_heapData(JSHeapData::ensureHeapData(vm.heap))
+    , CLIENT_ISO_SUBSPACE_INIT(m_domBuiltinConstructorSpace)
     , CLIENT_ISO_SUBSPACE_INIT(m_domConstructorSpace)
+    , CLIENT_ISO_SUBSPACE_INIT(m_domNamespaceObjectSpace)
     , m_clientSubspaces(makeUnique<ExtendedDOMClientIsoSubspaces>())
-    , m_builtinFunctions(vm)
+
 {
 }
 
@@ -59,8 +64,11 @@ JSHeapData* JSHeapData::ensureHeapData(Heap& heap)
     return singleton;
 }
 
-JSVMClientData::~JSVMClientData() {}
-
+JSVMClientData::~JSVMClientData()
+{
+    ASSERT(m_normalWorld->hasOneRef());
+    m_normalWorld = nullptr;
+}
 void JSVMClientData::create(VM* vm)
 {
     JSVMClientData* clientData = new JSVMClientData(*vm);
@@ -68,7 +76,6 @@ void JSVMClientData::create(VM* vm)
     clientData->m_normalWorld = DOMWrapperWorld::create(*vm, DOMWrapperWorld::Type::Normal);
 
     vm->heap.addMarkingConstraint(makeUnique<WebCore::DOMGCOutputConstraint>(*vm, clientData->heapData()));
-
     vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController(true));
 }