diff --git a/src/bun.js/bindings/BunString.cpp b/src/bun.js/bindings/BunString.cpp index b8e3bb9a86..bbac2a3962 100644 --- a/src/bun.js/bindings/BunString.cpp +++ b/src/bun.js/bindings/BunString.cpp @@ -65,14 +65,6 @@ extern "C" bool BunString__fromJS(JSC::JSGlobalObject* globalObject, JSC::Encode return bunString->tag != BunStringTag::Dead; } -extern "C" bool BunString__fromJSRef(JSC::JSGlobalObject* globalObject, JSC::EncodedJSValue encodedValue, BunString* bunString) -{ - - JSC::JSValue value = JSC::JSValue::decode(encodedValue); - *bunString = Bun::toStringRef(globalObject, value); - return bunString->tag != BunStringTag::Dead; -} - extern "C" BunString BunString__createAtom(const char* bytes, size_t length) { ASSERT(simdutf::validate_ascii(bytes, length)); diff --git a/src/sql/postgres.zig b/src/sql/postgres.zig index 91d49721d8..1fc6d0835c 100644 --- a/src/sql/postgres.zig +++ b/src/sql/postgres.zig @@ -1019,7 +1019,8 @@ pub const PostgresRequest = struct { }, else => { - const str = try String.fromJSRef(value, globalObject); + const str = try String.fromJS2(value, globalObject); + if (str.tag == .Dead) return error.OutOfMemory; defer str.deref(); const slice = str.toUTF8WithoutRef(bun.default_allocator); defer slice.deinit(); diff --git a/src/string.zig b/src/string.zig index 411be37d49..6589bac10e 100644 --- a/src/string.zig +++ b/src/string.zig @@ -742,20 +742,6 @@ pub const String = extern struct { } } - pub fn fromJSRef(value: bun.JSC.JSValue, globalObject: *JSC.JSGlobalObject) bun.JSError!String { - JSC.markBinding(@src()); - - var out: String = String.dead; - if (BunString__fromJSRef(globalObject, value, &out)) { - return out; - } else { - if (comptime bun.Environment.isDebug) { - bun.assert(globalObject.hasException()); - } - return error.JSError; - } - } - pub fn tryFromJS(value: bun.JSC.JSValue, globalObject: *JSC.JSGlobalObject) ?String { JSC.markBinding(@src()); @@ -1078,7 +1064,6 @@ pub const String = extern struct { extern fn BunString__toJSWithLength(globalObject: *JSC.JSGlobalObject, in: *const String, usize) JSC.JSValue; extern fn BunString__toJSDOMURL(globalObject: *JSC.JSGlobalObject, in: *String) JSC.JSValue; extern fn Bun__parseDate(*JSC.JSGlobalObject, *String) f64; - extern fn BunString__fromJSRef(globalObject: *JSC.JSGlobalObject, value: bun.JSC.JSValue, out: *String) bool; extern fn BunString__toWTFString(this: *String) void; extern fn BunString__createUTF8ForJS(globalObject: *JSC.JSGlobalObject, ptr: [*]const u8, len: usize) JSC.JSValue;