Add a way for us to make ResolveMessage & BuildMessage properly extend ErrorInstance

Author: Jarred-Sumner

Source/JavaScriptCore/runtime/ErrorInstance.cpp

@@ -223,7 +223,7 @@ void ErrorInstance::finishCreation(VM& vm, String&& message, LineColumn lineColu
 
     m_lineColumn = lineColumn;
     m_sourceURL = WTFMove(sourceURL);
-    
+
     {
         Locker locker { cellLock() };
         m_stackString = WTFMove(stackString);
@@ -318,8 +318,35 @@ String ErrorInstance::tryGetMessageForDebugging()
     return emptyString();
 }
 
+#if USE(BUN_JSC_ADDITIONS)
+extern "C" __attribute__((weak)) void Bun__errorInstance__finalize(void* bunNativePtr);
+
+class BunErrorInstanceFinalizer {
+public:
+    BunErrorInstanceFinalizer(JSC::ErrorInstance* errorInstance)
+        : m_errorInstance(errorInstance)
+    {
+    }
+
+    ~BunErrorInstanceFinalizer()
+    {
+        if (Bun__errorInstance__finalize && m_errorInstance->bunErrorData()) {
+            Bun__errorInstance__finalize(m_errorInstance->bunErrorData());
+        }
+    }
+
+private:
+    JSC::ErrorInstance* m_errorInstance;
+};
+#endif
+
 void ErrorInstance::finalizeUnconditionally(VM& vm, CollectionScope)
 {
+#if USE(BUN_JSC_ADDITIONS)
+    // Run this after we've computed the stack trace so that it can potentially be used there.
+    BunErrorInstanceFinalizer finalizer(this);
+#endif
+
     if (!m_stackTrace)
         return;
 
@@ -346,7 +373,7 @@ void ErrorInstance::computeErrorInfo(VM& vm, bool allocationAllowed)
         auto& fn = vm.onComputeErrorInfo();
         WTF::String stackString;
         if (fn) {
-            stackString = fn(vm, *m_stackTrace.get(), m_lineColumn.line, m_lineColumn.column, m_sourceURL);
+            stackString = fn(vm, *m_stackTrace.get(), m_lineColumn.line, m_lineColumn.column, m_sourceURL, this->bunErrorData());
         } else {
             getLineColumnAndSource(vm, m_stackTrace.get(), m_lineColumn, m_sourceURL);
             stackString = Interpreter::stackTraceAsString(vm, *m_stackTrace.get());
@@ -373,7 +400,7 @@ bool ErrorInstance::materializeErrorInfoIfNeeded(VM& vm)
         m_errorInfoMaterialized = true;
         DeferGCForAWhile deferGC(vm);
 
-        JSValue stack = fn(vm, *m_stackTrace.get(), m_lineColumn.line, m_lineColumn.column, m_sourceURL, this);
+        JSValue stack = fn(vm, *m_stackTrace.get(), m_lineColumn.line, m_lineColumn.column, m_sourceURL, this, this->bunErrorData());
 
         {
             Locker locker { cellLock() };

Source/JavaScriptCore/runtime/ErrorInstance.h

@@ -82,7 +82,10 @@ class ErrorInstance : public JSNonFinalObject {
     void setRuntimeTypeForCause(RuntimeType type) { m_runtimeTypeForCause = type; }
     RuntimeType runtimeTypeForCause() const { return m_runtimeTypeForCause; }
     void clearRuntimeTypeForCause() { m_runtimeTypeForCause = TypeNothing; }
-
+#if USE(BUN_JSC_ADDITIONS)
+    void* bunErrorData() const { return m_bunErrorData; }
+    void setBunErrorData(void* bunErrorData) { m_bunErrorData = bunErrorData; }
+#endif
     ErrorType errorType() const { return m_errorType; }
     void setStackOverflowError()
     {
@@ -151,6 +154,10 @@ class ErrorInstance : public JSNonFinalObject {
 
     void computeErrorInfo(VM&, bool allocationAllowed);
 
+#if USE(BUN_JSC_ADDITIONS)
+    void* m_bunErrorData { nullptr };
+#endif
+
     SourceAppender m_sourceAppender { nullptr };
     std::unique_ptr<Vector<StackFrame>> m_stackTrace;
     LineColumn m_lineColumn;

Source/JavaScriptCore/runtime/VM.h

@@ -170,8 +170,8 @@ constexpr bool validateDFGDoesGC = ENABLE_DFG_DOES_GC_VALIDATION;
 
 #if USE(BUN_JSC_ADDITIONS)
 using StackTraceAppenderFunction = WTF::Function<void(VM&, JSCell* owner, Vector<StackFrame>& stackTrace, size_t maxToAppend)>;
-using ErrorInfoFunction = WTF::Function<String(VM&, Vector<StackFrame>& stackTrace, unsigned& line, unsigned& column, String& sourceURL)>;
-using ErrorInfoFunctionJSValue = WTF::Function<JSValue(VM&, Vector<StackFrame>& stackTrace, unsigned& line, unsigned& column, String& sourceURL, JSC::JSObject*)>;
+using ErrorInfoFunction = WTF::Function<String(VM&, Vector<StackFrame>& stackTrace, unsigned& line, unsigned& column, String& sourceURL, void* bunErrorData)>;
+using ErrorInfoFunctionJSValue = WTF::Function<JSValue(VM&, Vector<StackFrame>& stackTrace, unsigned& line, unsigned& column, String& sourceURL, JSC::JSObject*, void* bunErrorData)>;
 #endif
 
 #if ENABLE(FTL_JIT)

Source/cmake/WebKitCompilerFlags.cmake

@@ -247,14 +247,16 @@ if (COMPILER_IS_GCC_OR_CLANG)
                                                 -Wl,-U,_WTFTimer__deinit
                                                 -Wl,-U,_WTFTimer__isActive
                                                 -Wl,-U,_WTFTimer__secondsUntilTimer
-                                                -Wl,-U,_WTFTimer__cancel)
+                                                -Wl,-U,_WTFTimer__cancel
+                                                -Wl,-U,_Bun__errorInstance__finalize)
         else()
             WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wl,-u,_WTFTimer__create
                                                 -Wl,-u,_WTFTimer__update
                                                 -Wl,-u,_WTFTimer__deinit
                                                 -Wl,-u,_WTFTimer__isActive
                                                 -Wl,-u,_WTFTimer__secondsUntilTimer
-                                                -Wl,-u,_WTFTimer__cancel)
+                                                -Wl,-u,_WTFTimer__cancel
+                                                -Wl,-u,_Bun__errorInstance__finalize)
         endif()
     endif ()
 endif ()