Skip to content

Propagate exceptions in Iterator.concat #1256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 1 commit into from
Dec 2, 2025
Merged

Propagate exceptions in Iterator.concat #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 15 additions & 44 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41781,21 +41781,23 @@ static void js_iterator_concat_mark(JSRuntime *rt, JSValueConst val,
}

static JSValue js_iterator_concat_next(JSContext *ctx, JSValueConst this_val,
int argc, JSValueConst *argv)
int argc, JSValueConst *argv,
int *pdone, int magic)
{
JSValue iter, item, next, val, *obj, *meth;
JSIteratorConcatData *it;
JSPropertyDescriptor d;
int done, ret;
int done;

it = JS_GetOpaque2(ctx, this_val, JS_CLASS_ITERATOR_CONCAT);
if (!it)
return JS_EXCEPTION;
if (it->running)
return JS_ThrowTypeError(ctx, "already running");
next:
if (it->index >= it->count)
return js_create_iterator_result(ctx, JS_UNDEFINED, /*done*/true);
if (it->index >= it->count) {
*pdone = true;
return JS_UNDEFINED;
}
obj = &it->values[it->index + 0];
meth = &it->values[it->index + 1];
iter = it->iter;
Expand All @@ -41817,8 +41819,10 @@ static JSValue js_iterator_concat_next(JSContext *ctx, JSValueConst this_val,
it->running = false;
if (JS_IsException(item))
return JS_EXCEPTION;
if (!done)
return js_create_iterator_result(ctx, item, /*done*/false);
if (!done) {
*pdone = false;
return item;
}
// done==1 means really done, done==2 means "unknown, inspect object"
if (done == 2) {
val = JS_GetProperty(ctx, item, JS_ATOM_done);
Expand All @@ -41839,38 +41843,10 @@ static JSValue js_iterator_concat_next(JSContext *ctx, JSValueConst this_val,
it->index += 2;
goto next;
}
// not done, construct { done: false, value: xxx } object
// copy .value verbatim from source object, spec doesn't
// allow dereferencing getters here
d = (JSPropertyDescriptor){
.value = JS_UNDEFINED,
.getter = JS_UNDEFINED,
.setter = JS_UNDEFINED,
};
ret = JS_GetOwnProperty(ctx, &d, item, JS_ATOM_value);
val = JS_GetProperty(ctx, item, JS_ATOM_value);
JS_FreeValue(ctx, item);
if (ret < 0)
return JS_EXCEPTION;
if (d.flags & JS_PROP_GETSET) {
d.flags |= JS_PROP_HAS_GET | JS_PROP_HAS_SET;
} else {
d.flags |= JS_PROP_HAS_VALUE;
}
item = JS_NewObject(ctx);
if (JS_IsException(item))
goto fail;
if (JS_DefinePropertyValue(ctx, item, JS_ATOM_done, JS_FALSE,
JS_PROP_C_W_E) < 0) {
goto fail;
}
if (JS_DefineProperty(ctx, item, JS_ATOM_value, d.value, d.getter,
d.setter, d.flags | JS_PROP_C_W_E) < 0) {
fail:
JS_FreeValue(ctx, item);
item = JS_EXCEPTION;
}
js_free_desc(ctx, &d);
return item;
*pdone = false;
return val;
}

static JSValue js_iterator_concat_return(JSContext *ctx, JSValueConst this_val,
Expand Down Expand Up @@ -41902,13 +41878,8 @@ static JSValue js_iterator_concat_return(JSContext *ctx, JSValueConst this_val,
return ret;
}

// note: |next| and |return| don't use JS_ITERATOR_NEXT_DEF because |next|
// has to return a full { value: xxx, done: xxx } step object - it must
// copy getters and setters from the inner iterator's step object
// slightly inefficient because of the intermediate step object that is
// created but that can't be helped right now
static const JSCFunctionListEntry js_iterator_concat_proto_funcs[] = {
JS_CFUNC_DEF("next", 1, js_iterator_concat_next ),
JS_ITERATOR_NEXT_DEF("next", 1, js_iterator_concat_next, 0 ),
JS_CFUNC_DEF("return", 1, js_iterator_concat_return ),
JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Iterator Concat", JS_PROP_CONFIGURABLE ),
};
Expand Down
2 changes: 0 additions & 2 deletions test262_errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ test262/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-reje
test262/test/built-ins/AsyncFromSyncIteratorPrototype/throw/iterator-result-rejected-promise-close.js:74: strict mode: TypeError: $DONE() not called
test262/test/built-ins/AsyncFromSyncIteratorPrototype/throw/throw-result-poisoned-wrapper.js:81: TypeError: $DONE() not called
test262/test/built-ins/AsyncFromSyncIteratorPrototype/throw/throw-result-poisoned-wrapper.js:81: strict mode: TypeError: $DONE() not called
test262/test/built-ins/Iterator/concat/next-method-returns-throwing-value.js:25: Test262Error: Expected a Test262Error to be thrown but no exception was thrown at all
test262/test/built-ins/Iterator/concat/next-method-returns-throwing-value.js:25: strict mode: Test262Error: Expected a Test262Error to be thrown but no exception was thrown at all
test262/test/built-ins/RegExp/property-escapes/generated/Script_-_Unknown.js:16: SyntaxError: unknown unicode script
test262/test/built-ins/RegExp/property-escapes/generated/Script_-_Unknown.js:16: strict mode: SyntaxError: unknown unicode script
test262/test/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Unknown.js:16: SyntaxError: unknown unicode script
Expand Down