diff options
-rw-r--r-- | src/bun.js/bindings/JSDOMExceptionHandling.cpp | 4 | ||||
-rw-r--r-- | src/bun.js/bindings/ZigGlobalObject.cpp | 4 | ||||
-rw-r--r-- | test/bun.js/path.test.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bun.js/bindings/JSDOMExceptionHandling.cpp b/src/bun.js/bindings/JSDOMExceptionHandling.cpp index b3627481d..38a55f7f2 100644 --- a/src/bun.js/bindings/JSDOMExceptionHandling.cpp +++ b/src/bun.js/bindings/JSDOMExceptionHandling.cpp @@ -71,10 +71,10 @@ void reportException(JSGlobalObject* lexicalGlobalObject, JSC::Exception* except // exceptionSourceURL = callFrame->sourceURL(); // } - auto errorMessage = retrieveErrorMessage(*lexicalGlobalObject, vm, exception->value(), scope); - Zig__GlobalObject__reportUncaughtException(globalObject, exception); + Zig::GlobalObject::reportUncaughtExceptionAtEventLoop(globalObject, exception); if (exceptionDetails) { + auto errorMessage = retrieveErrorMessage(*lexicalGlobalObject, vm, exception->value(), scope); exceptionDetails->message = errorMessage; exceptionDetails->lineNumber = lineNumber; exceptionDetails->columnNumber = columnNumber; diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp index 03cee0bb4..ee3aa602d 100644 --- a/src/bun.js/bindings/ZigGlobalObject.cpp +++ b/src/bun.js/bindings/ZigGlobalObject.cpp @@ -259,6 +259,8 @@ extern "C" bool Zig__GlobalObject__resetModuleRegistryMap(JSC__JSGlobalObject* g return true; } +extern "C" void Bun__reportError(JSC__JSGlobalObject*, JSC__JSValue); + namespace Zig { using namespace WebCore; @@ -358,7 +360,7 @@ WebCore::ScriptExecutionContext* GlobalObject::scriptExecutionContext() const void GlobalObject::reportUncaughtExceptionAtEventLoop(JSGlobalObject* globalObject, JSC::Exception* exception) { - Zig__GlobalObject__reportUncaughtException(globalObject, exception); + Bun__reportError(globalObject, JSValue::encode(JSValue(exception))); } void GlobalObject::promiseRejectionTracker(JSGlobalObject* obj, JSC::JSPromise* promise, diff --git a/test/bun.js/path.test.js b/test/bun.js/path.test.js index 997368150..72dad93d2 100644 --- a/test/bun.js/path.test.js +++ b/test/bun.js/path.test.js @@ -368,9 +368,7 @@ it("path.normalize", () => { strictEqual(path.posix.normalize("bar/foo../../baz"), "bar/baz"); strictEqual(path.posix.normalize("bar/foo../"), "bar/foo../"); strictEqual(path.posix.normalize("bar/foo.."), "bar/foo.."); - console.log("A"); strictEqual(path.posix.normalize("../foo../../../bar"), "../../bar"); - console.log("B"); strictEqual(path.posix.normalize("../.../.././.../../../bar"), "../../bar"); strictEqual( path.posix.normalize("../../../foo/../../../bar"), |