Skip to content

Pass the error instance to the stack string callback #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −1
Open

Pass the error instance to the stack string callback #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Source/JavaScriptCore/runtime/ErrorInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,18 @@ void ErrorInstance::computeErrorInfo(VM& vm, bool allocationAllowed)
UNUSED_PARAM(allocationAllowed);

if (m_stackTrace && !m_stackTrace->isEmpty()) {
auto& fnWithInstance = vm.onComputeErrorInfoWithInstance();
auto& fn = vm.onComputeErrorInfo();
WTF::String stackString;
if (fn) {
if (fnWithInstance) {
// Preferred over onComputeErrorInfo: passing the instance lets the
// callback include the error's name and message in the stack string
// even when this runs from the GC finalizer (finalizeUnconditionally).
if (m_stackPropertyAlreadyMaterialized)
stackString = emptyString();
else
stackString = fnWithInstance(vm, *m_stackTrace.get(), m_lineColumn.line, m_lineColumn.column, m_sourceURL, this, this->bunErrorData());
} else if (fn) {
if (m_stackPropertyAlreadyMaterialized)
stackString = emptyString();
else
Expand Down
6 changes: 6 additions & 0 deletions Source/JavaScriptCore/runtime/VM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ 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, void* bunErrorData)>;
using ErrorInfoWithInstanceFunction = WTF::Function<String(VM&, Vector<StackFrame>& stackTrace, unsigned& line, unsigned& column, String& sourceURL, JSC::JSObject* errorInstance, void* bunErrorData)>;
using ErrorInfoFunctionJSValue = WTF::Function<JSValue(VM&, Vector<StackFrame>& stackTrace, unsigned& line, unsigned& column, String& sourceURL, JSC::JSObject*, void* bunErrorData)>;
#endif

Expand Down Expand Up @@ -1062,6 +1063,9 @@ class VM : public ThreadSafeRefCountedWithSuppressingSaferCPPChecking<VM> {
const ErrorInfoFunction& onComputeErrorInfo() const { return m_onComputeErrorInfo; }
ErrorInfoFunction& onComputeErrorInfo() { return m_onComputeErrorInfo; }

const ErrorInfoWithInstanceFunction& onComputeErrorInfoWithInstance() const { return m_onComputeErrorInfoWithInstance; }
ErrorInfoWithInstanceFunction& onComputeErrorInfoWithInstance() { return m_onComputeErrorInfoWithInstance; }

const ErrorInfoFunctionJSValue& onComputeErrorInfoJSValue() const { return m_onComputeErrorInfoJSValue; }
ErrorInfoFunctionJSValue& onComputeErrorInfoJSValue() { return m_onComputeErrorInfoJSValue; }

Expand All @@ -1070,6 +1074,7 @@ class VM : public ThreadSafeRefCountedWithSuppressingSaferCPPChecking<VM> {

void setOnAppendStackTrace(StackTraceAppenderFunction&& function) { m_onAppendStackTrace = WTF::move(function); }
void setOnComputeErrorInfo(ErrorInfoFunction&& function) { m_onComputeErrorInfo = WTF::move(function); }
void setOnComputeErrorInfoWithInstance(ErrorInfoWithInstanceFunction&& function) { m_onComputeErrorInfoWithInstance = WTF::move(function); }
void setOnComputeErrorInfoJSValue(ErrorInfoFunctionJSValue&& function) { m_onComputeErrorInfoJSValue = WTF::move(function); }
void setComputeLineColumnWithSourcemap(WTF::Function<void(VM&, SourceProvider*, LineColumn&, String&)>&& function) { m_computeLineColumnWithSourcemap = WTF::move(function); }
#endif
Expand Down Expand Up @@ -1287,6 +1292,7 @@ class VM : public ThreadSafeRefCountedWithSuppressingSaferCPPChecking<VM> {
WTF::Function<void(VM&)> m_onEachMicrotaskTick;
#if USE(BUN_JSC_ADDITIONS)
ErrorInfoFunction m_onComputeErrorInfo;
ErrorInfoWithInstanceFunction m_onComputeErrorInfoWithInstance;
ErrorInfoFunctionJSValue m_onComputeErrorInfoJSValue;
StackTraceAppenderFunction m_onAppendStackTrace;
WTF::Function<void(VM&, SourceProvider*, LineColumn&, String&)> m_computeLineColumnWithSourcemap;
Expand Down
Loading