github_mirrors/quickjs
3
0
Fork 1
mirror of https://github.com/bellard/quickjs.git synced 2025-09-30 06:54:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed async generator in case of exception in the implicit await in the 'return' statement

Browse Source
This commit is contained in:
Fabrice Bellard
2023-12-13 19:01:59 +01:00
parent a42681a4a3
commit 57105c7f23
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
quickjs.c
View File

@@ -19182,7 +19182,7 @@ static int js_async_generator_completed_return(JSContext *ctx,
// exception should be delivered to the catch handler.
if (JS_IsException(promise)) {
JSValue err = JS_GetException(ctx);
promise = js_promise_resolve(ctx, ctx->promise_ctor, 1, &err,
promise = js_promise_resolve(ctx, ctx->promise_ctor, 1, (JSValueConst *)&err,
/*is_reject*/1);
JS_FreeValue(ctx, err);
if (JS_IsException(promise))
@@ -19235,7 +19235,6 @@ static void js_async_generator_resume_next(JSContext *ctx,
} else if (next->completion_type == GEN_MAGIC_RETURN) {
s->state = JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN;
js_async_generator_completed_return(ctx, s, next->result);
goto done;
} else {
js_async_generator_reject(ctx, s, next->result);
}
@@ -19266,7 +19265,7 @@ static void js_async_generator_resume_next(JSContext *ctx,
js_async_generator_reject(ctx, s, value);
JS_FreeValue(ctx, value);
} else if (JS_VALUE_GET_TAG(func_ret) == JS_TAG_INT) {
int func_ret_code;
int func_ret_code, ret;
value = s->func_state.frame.cur_sp[-1];
s->func_state.frame.cur_sp[-1] = JS_UNDEFINED;
func_ret_code = JS_VALUE_GET_INT(func_ret);
@@ -19281,8 +19280,13 @@ static void js_async_generator_resume_next(JSContext *ctx,
JS_FreeValue(ctx, value);
break;
case FUNC_RET_AWAIT:
js_async_generator_await(ctx, s, value);
ret = js_async_generator_await(ctx, s, value);
JS_FreeValue(ctx, value);
if (ret < 0) {
/* exception: throw it */
s->func_state.throw_flag = TRUE;
goto resume_exec;
}
goto done;
default:
abort();
@@ -25436,6 +25440,18 @@ static void emit_return(JSParseState *s, BOOL hasval)
BlockEnv *top;
int drop_count;
if (s->cur_func->func_kind != JS_FUNC_NORMAL) {
if (!hasval) {
/* no value: direct return in case of async generator */
emit_op(s, OP_undefined);
hasval = TRUE;
} else if (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR) {
/* the await must be done before handling the "finally" in
case it raises an exception */
emit_op(s, OP_await);
}
}
drop_count = 0;
top = s->cur_func->top_break;
while (top != NULL) {
@@ -25514,11 +25530,6 @@ static void emit_return(JSParseState *s, BOOL hasval)
emit_label(s, label_return);
emit_op(s, OP_return);
} else if (s->cur_func->func_kind != JS_FUNC_NORMAL) {
if (!hasval) {
emit_op(s, OP_undefined);
} else if (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR) {
emit_op(s, OP_await);
}
emit_op(s, OP_return_async);
} else {
emit_op(s, hasval ? OP_return : OP_return_undef);