mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-10 19:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[napi] Fix string bug

Browse Source
This commit is contained in:
Jarred Sumner
2022-05-10 20:24:07 -07:00
parent 01a0aee1e8
commit 08e40efe11
4 changed files with 123 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/javascript/jsc/bindings/bindings.zig
View File

@@ -2889,6 +2889,13 @@ pub const JSValue = enum(u64) {
return @ptrCast(C_API.JSObjectRef, this.asVoid());
}
/// When the GC sees a JSValue referenced in the stack
/// It knows not to free it
/// This mimicks the implementation in JavaScriptCore's C++
pub inline fn ensureStillAlive(this: JSValue) void {
std.mem.doNotOptimizeAway(@ptrCast(C_API.JSObjectRef, this.asVoid()));
}
pub inline fn asVoid(this: JSValue) *anyopaque {
if (comptime bun.Environment.allow_assert) {
if (@enumToInt(this) == 0) {

64
src/javascript/jsc/bindings/napi.cpp
View File

@@ -216,22 +216,22 @@ static void defineNapiProperty(Zig::GlobalObject* globalObject, JSC::JSObject* t
if (property.method) {
JSC::JSValue value;
auto method = reinterpret_cast<Zig::FFIFunction>(property.method);
if (!dataPtr) {
JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create(
globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue {
JSC::MarkedArgumentBuffer values;
values.append(callFrame->thisValue());
for (int i = 0; i < callFrame->argumentCount(); i++) {
values.append(callFrame->argument(i));
}
return method(globalObject, callFrame);
});
value = JSC::JSValue(func);
} else {
auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, nameStr, method);
function->dataPtr = dataPtr;
value = JSC::JSValue(function);
}
// if (!dataPtr) {
// JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create(
// globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue {
// JSC::MarkedArgumentBuffer values;
// values.append(callFrame->thisValue());
// for (int i = 0; i < callFrame->argumentCount(); i++) {
// values.append(callFrame->argument(i));
// }
// return method(globalObject, callFrame);
// });
// value = JSC::JSValue(func);
// } else {
auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, nameStr, method);
function->dataPtr = dataPtr;
value = JSC::JSValue(function);
// }
to->putDirect(vm, propertyName, value, getPropertyAttributes(property) | JSC::PropertyAttribute::Function);
return;
@@ -541,22 +541,22 @@ extern "C" napi_status napi_create_function(napi_env env, const char* utf8name,
JSC::VM& vm = globalObject->vm();
auto name = WTF::String::fromUTF8(utf8name, length == NAPI_AUTO_LENGTH ? strlen(utf8name) : length).isolatedCopy();
auto method = reinterpret_cast<Zig::FFIFunction>(cb);
if (data) {
auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, name, method);
function->dataPtr = data;
*result = toNapi(JSC::JSValue(function));
} else {
JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create(
globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue {
JSC::MarkedArgumentBuffer values;
values.append(callFrame->thisValue());
for (int i = 0; i < callFrame->argumentCount(); i++) {
values.append(callFrame->argument(i));
}
return method(globalObject, callFrame);
});
*result = toNapi(JSC::JSValue(func));
}
// if (data) {
auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, name, method);
function->dataPtr = data;
*result = toNapi(JSC::JSValue(function));
// } else {
// JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create(
// globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue {
// JSC::MarkedArgumentBuffer values;
// values.append(callFrame->thisValue());
// for (int i = 0; i < callFrame->argumentCount(); i++) {
// values.append(callFrame->argument(i));
// }
// return method(globalObject, callFrame);
// });
// *result = toNapi(JSC::JSValue(func));
// }
// std::cout << "napi_create_function: " << utf8name << std::endl;