Skip to content

WIP: Port recent bellard/quickjs fixes for module async evaluation logic and lifetime #1166

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −8
Draft

WIP: Port recent bellard/quickjs fixes for module async evaluation logic and lifetime #1166

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
64 changes: 57 additions & 7 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,8 @@ struct JSModuleDef {
int async_parent_modules_count;
int async_parent_modules_size;
int pending_async_dependencies;
/* true: async_evaluation_timestamp corresponds to [[AsyncEvaluationOrder]]
false: [[AsyncEvaluationOrder]] is UNSET or DONE */
bool async_evaluation;
int64_t async_evaluation_timestamp;
JSModuleDef *cycle_root;
Expand Down Expand Up @@ -28849,6 +28851,15 @@ static int js_execute_async_module(JSContext *ctx, JSModuleDef *m);
static int js_execute_sync_module(JSContext *ctx, JSModuleDef *m,
JSValue *pvalue);

#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
static void js_dump_module(JSContext *ctx, const char *str, JSModuleDef *m)
{
char buf1[ATOM_GET_STR_BUF_SIZE];
static const char *module_status_str[] = { "unlinked", "linking", "linked", "evaluating", "evaluating_async", "evaluated" };
printf("%s: %s status=%s\n", str, JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name), module_status_str[m->status]);
}
#endif

static JSValue js_async_module_execution_rejected(JSContext *ctx, JSValueConst this_val,
int argc, JSValueConst *argv, int magic,
JSValueConst *func_data)
Expand All @@ -28857,6 +28868,12 @@ static JSValue js_async_module_execution_rejected(JSContext *ctx, JSValueConst t
JSValueConst error = argv[0];
int i;

#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, __func__, module);
}
#endif

if (js_check_stack_overflow(ctx->rt, 0))
return JS_ThrowStackOverflow(ctx);

Expand All @@ -28872,6 +28889,7 @@ static JSValue js_async_module_execution_rejected(JSContext *ctx, JSValueConst t
module->eval_has_exception = true;
module->eval_exception = js_dup(error);
module->status = JS_MODULE_STATUS_EVALUATED;
module->async_evaluation = false;

for(i = 0; i < module->async_parent_modules_count; i++) {
JSModuleDef *m = module->async_parent_modules[i];
Expand Down Expand Up @@ -28899,6 +28917,12 @@ static JSValue js_async_module_execution_fulfilled(JSContext *ctx, JSValueConst
ExecModuleList exec_list_s, *exec_list = &exec_list_s;
int i;

#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, __func__, module);
}
#endif

if (module->status == JS_MODULE_STATUS_EVALUATED) {
assert(module->eval_has_exception);
return JS_UNDEFINED;
Expand All @@ -28924,6 +28948,11 @@ static JSValue js_async_module_execution_fulfilled(JSContext *ctx, JSValueConst

for(i = 0; i < exec_list->count; i++) {
JSModuleDef *m = exec_list->tab[i];
#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
printf(" %d/%d", i, exec_list->count); js_dump_module(ctx, "", m);
}
#endif
if (m->status == JS_MODULE_STATUS_EVALUATED) {
assert(m->eval_has_exception);
} else if (m->has_tla) {
Expand All @@ -28938,6 +28967,7 @@ static JSValue js_async_module_execution_fulfilled(JSContext *ctx, JSValueConst
JS_FreeValue(ctx, m_obj);
JS_FreeValue(ctx, error);
} else {
m->async_evaluation = false;
js_set_module_evaluated(ctx, m);
}
}
Expand All @@ -28950,6 +28980,11 @@ static int js_execute_async_module(JSContext *ctx, JSModuleDef *m)
{
JSValue promise, m_obj;
JSValue resolve_funcs[2], ret_val;
#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, __func__, m);
}
#endif
promise = js_async_function_call(ctx, m->func_obj, JS_UNDEFINED, 0, NULL, 0);
if (JS_IsException(promise))
return -1;
Expand All @@ -28969,6 +29004,11 @@ static int js_execute_async_module(JSContext *ctx, JSModuleDef *m)
static int js_execute_sync_module(JSContext *ctx, JSModuleDef *m,
JSValue *pvalue)
{
#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, __func__, m);
}
#endif
if (m->init_func) {
/* C module init : no asynchronous execution */
if (m->init_func(ctx, m) < 0)
Expand Down Expand Up @@ -29008,19 +29048,18 @@ static int js_inner_module_evaluation(JSContext *ctx, JSModuleDef *m,
JSModuleDef *m1;
int i;

#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, __func__, m);
}
#endif

if (js_check_stack_overflow(ctx->rt, 0)) {
JS_ThrowStackOverflow(ctx);
*pvalue = JS_GetException(ctx);
return -1;
}

#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_RESOLVE
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_RESOLVE)) {
char buf1[ATOM_GET_STR_BUF_SIZE];
printf("js_inner_module_evaluation '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
}
#endif

if (m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
m->status == JS_MODULE_STATUS_EVALUATED) {
if (m->eval_has_exception) {
Expand Down Expand Up @@ -29121,6 +29160,12 @@ static JSValue js_evaluate_module(JSContext *ctx, JSModuleDef *m)
JSModuleDef *m1, *stack_top;
JSValue ret_val, result;

#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, __func__, m);
}
#endif

assert(m->status == JS_MODULE_STATUS_LINKED ||
m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
m->status == JS_MODULE_STATUS_EVALUATED);
Expand Down Expand Up @@ -29153,6 +29198,11 @@ static JSValue js_evaluate_module(JSContext *ctx, JSModuleDef *m)
1, vc(&m->eval_exception));
JS_FreeValue(ctx, ret_val);
} else {
#ifdef ENABLE_DUMPS // JS_DUMP_MODULE_EXEC
if (check_dump_flag(ctx->rt, JS_DUMP_MODULE_EXEC)) {
js_dump_module(ctx, " done", m);
}
#endif
assert(m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
m->status == JS_MODULE_STATUS_EVALUATED);
assert(!m->eval_has_exception);
Expand Down
1 change: 1 addition & 0 deletions quickjs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ typedef struct JSMallocFunctions {
#define JS_DUMP_OBJECTS 0x20000 /* dump objects in JS_FreeRuntime */
#define JS_DUMP_ATOMS 0x40000 /* dump atoms in JS_FreeRuntime */
#define JS_DUMP_SHAPES 0x80000 /* dump shapes in JS_FreeRuntime */
#define JS_DUMP_MODULE_EXEC 0x100000

// Finalizers run in LIFO order at the very end of JS_FreeRuntime.
// Intended for cleanup of associated resources; the runtime itself
Expand Down
1 change: 0 additions & 1 deletion test262_errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ test262/test/language/expressions/in/private-field-invalid-assignment-target.js:
test262/test/language/expressions/in/private-field-invalid-assignment-target.js:23: strict mode: unexpected error type: Test262: This statement should not be evaluated.
test262/test/language/expressions/object/computed-property-name-topropertykey-before-value-evaluation.js:31: Test262Error: Expected SameValue(«"bad"», «"ok"») to be true
test262/test/language/expressions/object/computed-property-name-topropertykey-before-value-evaluation.js:31: strict mode: Test262Error: Expected SameValue(«"bad"», «"ok"») to be true
test262/test/language/module-code/top-level-await/module-graphs-does-not-hang.js:10: TypeError: $DONE() not called
test262/test/language/statements/class/elements/syntax/valid/grammar-field-named-get-followed-by-generator-asi.js:40: SyntaxError: invalid property name
test262/test/language/statements/class/elements/syntax/valid/grammar-field-named-get-followed-by-generator-asi.js:40: strict mode: SyntaxError: invalid property name
test262/test/language/statements/class/elements/syntax/valid/grammar-field-named-set-followed-by-generator-asi.js:40: SyntaxError: invalid property name
Expand Down
Loading