mirrors/quickjs
1
0
Fork 0
mirror of https://github.com/bellard/quickjs.git synced 2025-05-29 01:49:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

added forgotten js_weakref_is_live() tests

Browse Source
This commit is contained in:
Fabrice Bellard 2025-04-05 15:41:51 +02:00
parent b342502a31
commit f121cbdb5a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quickjs.c
View File

@ -46594,6 +46594,7 @@ static BOOL js_weakref_is_target(JSValueConst val)
} }
/* JS_UNDEFINED is considered as a live weakref */ /* JS_UNDEFINED is considered as a live weakref */
/* XXX: add a specific JSWeakRef value type ? */
static BOOL js_weakref_is_live(JSValueConst val) static BOOL js_weakref_is_live(JSValueConst val)
{ {
int *pref_count; int *pref_count;
@ -53884,7 +53885,10 @@ static JSValue js_weakref_deref(JSContext *ctx, JSValueConst this_val, int argc,
JSWeakRefData *wrd = JS_GetOpaque2(ctx, this_val, JS_CLASS_WEAK_REF); JSWeakRefData *wrd = JS_GetOpaque2(ctx, this_val, JS_CLASS_WEAK_REF);
if (!wrd) if (!wrd)
return JS_EXCEPTION; return JS_EXCEPTION;
if (js_weakref_is_live(wrd->target))
return JS_DupValue(ctx, wrd->target); return JS_DupValue(ctx, wrd->target);
else
return JS_UNDEFINED;
} }
static const JSCFunctionListEntry js_weakref_proto_funcs[] = { static const JSCFunctionListEntry js_weakref_proto_funcs[] = {
@ -54051,7 +54055,7 @@ static JSValue js_finrec_unregister(JSContext *ctx, JSValueConst this_val, int a
removed = FALSE; removed = FALSE;
list_for_each_safe(el, el1, &frd->entries) { list_for_each_safe(el, el1, &frd->entries) {
JSFinRecEntry *fre = list_entry(el, JSFinRecEntry, link); JSFinRecEntry *fre = list_entry(el, JSFinRecEntry, link);
if (js_same_value(ctx, fre->token, token)) { if (js_weakref_is_live(fre->token) && js_same_value(ctx, fre->token, token)) {
js_weakref_free(ctx->rt, fre->target); js_weakref_free(ctx->rt, fre->target);
js_weakref_free(ctx->rt, fre->token); js_weakref_free(ctx->rt, fre->token);
JS_FreeValue(ctx, fre->held_val); JS_FreeValue(ctx, fre->held_val);

2
tests/test_builtin.js
View File

@ -849,6 +849,8 @@ function test_weak_ref()
assert(w2.deref(), o); assert(w2.deref(), o);
o = null; o = null;
assert(w1.deref(), undefined);
assert(w2.deref(), undefined);
std.gc(); std.gc();
assert(w1.deref(), undefined); assert(w1.deref(), undefined);
assert(w2.deref(), undefined); assert(w2.deref(), undefined);