From 8481f2922f4f6fe07f8b44067fe478cb1ac1706a Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:45:16 -0700
Subject: Add GC test for errors

---
 src/bun.js/WebKit                       | 2 +-
 src/bun.js/bindings/ZigGlobalObject.cpp | 8 ++++++--
 src/bun.js/javascript.zig               | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit
index a9e3ab9b8..8a03cf746 160000
--- a/src/bun.js/WebKit
+++ b/src/bun.js/WebKit
@@ -1 +1 @@
-Subproject commit a9e3ab9b85cf911218e1d51eed8079cd955ec578
+Subproject commit 8a03cf746abef8a48c932ab25f8821390632f2e2
diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
index 9ff3ebf93..7ba0f0b30 100644
--- a/src/bun.js/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -390,7 +390,11 @@ static String computeErrorInfoWithoutPrepareStackTrace(JSC::VM& vm, Vector<Stack
             frame.computeLineAndColumn(thisLine, thisColumn);
             remappedFrames[i].position.line = thisLine;
             remappedFrames[i].position.column_start = thisColumn;
-            remappedFrames[i].source_url = Bun::toString(frame.sourceURL(vm));
+            String sourceURLForFrame = frame.sourceURL(vm);
+
+            if (!sourceURLForFrame.isEmpty()) {
+                remappedFrames[i].source_url = Bun::toString(sourceURLForFrame);
+            }
 
             // This ensures the lifetime of the sourceURL is accounted for correctly
             Bun__remapStackFramePositions(globalObject, remappedFrames + i, 1);
@@ -409,7 +413,7 @@ static String computeErrorInfoWithoutPrepareStackTrace(JSC::VM& vm, Vector<Stack
                 }
             }
 
-            sb.append(frame.sourceURL(vm));
+            sb.append(sourceURLForFrame);
             sb.append(":"_s);
             sb.append(remappedFrames[i].position.line);
             sb.append(":"_s);
diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig
index 605cc0c25..572b66716 100644
--- a/src/bun.js/javascript.zig
+++ b/src/bun.js/javascript.zig
@@ -1933,9 +1933,9 @@ pub const VirtualMachine = struct {
 
             while (i < stack.len) : (i += 1) {
                 const frame = stack[@intCast(usize, i)];
-                const file_slice = frame.source_url.toSlice(bun.default_allocator);
+                const file_slice = frame.source_url.toUTF8(bun.default_allocator);
                 defer file_slice.deinit();
-                const func_slice = frame.function_name.toSlice(bun.default_allocator);
+                const func_slice = frame.function_name.toUTF8(bun.default_allocator);
                 defer func_slice.deinit();
 
                 const file = file_slice.slice();
-- 
cgit v1.2.3