From 97ea19dc81b574a9a12e1e778a35fc29b91564de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 6 Jan 2025 11:17:22 +0100
Subject: [PATCH] Simplify exiting interpreter with exception

- Avoid keeping the exception object around
- Avoid passing the responsibility of freeing the exeption object to the
  caller
---
 gen/function_source.c | Bin 2928 -> 2850 bytes
 gen/hello.c           | Bin 1559 -> 1481 bytes
 gen/hello_module.c    | Bin 4035 -> 3957 bytes
 gen/test_fib.c        | Bin 2864 -> 2786 bytes
 qjs.c                 |  12 ++++++------
 qjsc.c                |  11 ++++-------
 quickjs-libc.c        |  25 +++++++------------------
 quickjs-libc.h        |   3 +--
 run-test262.c         |   9 +++------
 9 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/gen/function_source.c b/gen/function_source.c
index 489dfa28a0859d9ef0ff5eea9f43818caeca2b1c..00b9aab1da5217f11ea73ce4fb0766a88ca26fef 100644
GIT binary patch
delta 73
zcmew$wn%J)9Oq_T&RoXHbGW2ciZm6fxfFmPt2n;6BqctjG`Ao=wWuh+NF%wVLem;3
YS36msTaDW}Kd&UUq68#5*^^rx0AC>&Q~&?~

delta 165
zcmZ1^_Caie94BX3VoqtQLQ!hTW(m$>MyAw~$=zJi^<Kg8p2e;e$*Bb;nfZAdKxs`)
zg=#JZAjm3?FD^-mPbtkUh)*pl$}ck1NG_?+0U4ob4OUU4V5?vVV%7pN&?L8_)KsuF
es0yJn&iQ#IsTCz4Ik0|^`I9el$xmkImIeSSl{2;g

diff --git a/gen/hello.c b/gen/hello.c
index 8c0f251cb58ea2544b0f4c33c0e33793c5890117..e68d3c7c83b954bbd9508775801555819c0922e7 100644
GIT binary patch
delta 68
zcmbQvbCP?*P3Fxnm?Ifw6l@i;isOq*QsQ&+^9wYRODZ(2xfB#K(-bs{CKs|wa>0da
RCtqV#n|zX0VDeX1B>*D#7G(ec

delta 138
zcmX@fJ)LL6O=ixp#GKMpg`(7w&6k<u84XfP6l@i;isOq*QsQ&+^9wYRODZ(2xfB#K
z(-btkg5y1lT`Q7P3raHc^E7~(G$;G9N*Wo0ROx^W0V`EdC;}Q{2+~yx#6VqcMX9M^
Ui(m>Tcd^P&E@4%kypB~G09_(0aR2}S

diff --git a/gen/hello_module.c b/gen/hello_module.c
index b6f1470bbc1ff69e6de4223951f141521d695f07..31987a576471e20f3c3582d47055b65b866376c5 100644
GIT binary patch
delta 45
zcmX>s|5a{7Iq&8+-gL&v@A;$|izdtROLA!>msDt4b15j)PHy5?n_S8-FnJ-r5&&pR
B4p0C9

delta 165
zcmew=cUXQyIWK2eVoqtQLQ!hT=0e_FMyAw~$@loA>%D^GJ&Ro{l2Z#xGV}8^fYO?p
z3e{W+K#)}&UtE$BpHiAz5T9C9lwV}1kz7)t12RI>8myv7!B)W##H<Bkph<2;si|OV
eP!&RDob&TaQY%V8a$x-+^CzqD%TJEtmj(dk^)#md

diff --git a/gen/test_fib.c b/gen/test_fib.c
index 28265006375d7d97937e33f407fa0a9210c6abb0..971ee69f9851be49041e33025de42e2f85bb837e 100644
GIT binary patch
delta 73
zcmdlW_DFQY8;;GtIpP^7$8brj6lp3{b148pR&jiBNlJW5X>LJ$YEe;skw$V!g{C!7
Yu6FW!E;VlF{JfIXiV~3MWKM2%0K?iD9smFU

delta 165
zcmaDPx<PEi8xGE}#GKMpg`(7w&CfVe8JSW`CVO*9*LwxWdltJ^B&QaXWaj5-0HrlG
z6{@)ufFP?lzPKbMKBY9bAU?IID8I;1Be|qP2V{h%HCRQFf~|rfh*=B7K$F~xQd7a!
epelsQIOpe;q*j!G<iPqt=1-o;B|rH%moxzO8a03b

diff --git a/qjs.c b/qjs.c
index 095bcfd..ada72d8 100644
--- a/qjs.c
+++ b/qjs.c
@@ -399,6 +399,7 @@ int main(int argc, char **argv)
     JSContext *ctx;
     JSValue ret = JS_UNDEFINED;
     struct trace_malloc_data trace_data = { NULL };
+    int r = 0;
     int optind = 1;
     char *compile_file = NULL;
     char *exe = NULL;
@@ -683,17 +684,16 @@ start:
         }
         if (standalone || compile_file) {
             if (JS_IsException(ret)) {
-                ret = JS_GetException(ctx);
+                r = 1;
             } else {
                 JS_FreeValue(ctx, ret);
-                ret = js_std_loop(ctx);
+                r = js_std_loop(ctx);
             }
         } else {
-            ret = js_std_loop(ctx);
+            r = js_std_loop(ctx);
         }
-        if (!JS_IsUndefined(ret)) {
-            js_std_dump_error1(ctx, ret);
-            JS_FreeValue(ctx, ret);
+        if (r) {
+            js_std_dump_error(ctx);
             goto fail;
         }
     }
diff --git a/qjsc.c b/qjsc.c
index 52216cb..2154614 100644
--- a/qjsc.c
+++ b/qjsc.c
@@ -315,7 +315,6 @@ static const char main_c_template1[] =
     "int main(int argc, char **argv)\n"
     "{\n"
     "  int r;\n"
-    "  JSValue ret;\n"
     "  JSRuntime *rt;\n"
     "  JSContext *ctx;\n"
     "  r = 0;\n"
@@ -325,14 +324,12 @@ static const char main_c_template1[] =
     ;
 
 static const char main_c_template2[] =
-    "  ret = js_std_loop(ctx);\n"
-    "  if (JS_IsException(ret)) {\n"
-    "    js_std_dump_error1(ctx, ret);\n"
-    "    r = 1;\n"
+    "  r = js_std_loop(ctx);\n"
+    "  if (r) {\n"
+    "    js_std_dump_error(ctx);\n"
     "  }\n"
-    "  JS_FreeValue(ctx, ret);\n"
-    "  JS_FreeContext(ctx);\n"
     "  js_std_free_handlers(rt);\n"
+    "  JS_FreeContext(ctx);\n"
     "  JS_FreeRuntime(rt);\n"
     "  return r;\n"
     "}\n";
diff --git a/quickjs-libc.c b/quickjs-libc.c
index 620e15e..0219bb4 100644
--- a/quickjs-libc.c
+++ b/quickjs-libc.c
@@ -161,7 +161,6 @@ typedef struct JSThreadState {
     struct list_head port_list; /* list of JSWorkerMessageHandler.link */
     int eval_script_recurse; /* only used in the main thread */
     int64_t next_timer_id; /* for setTimeout / setInterval */
-    JSValue exc; /* current exception from one of our handlers */
     BOOL can_js_os_poll;
     /* not used in the main thread */
     JSWorkerMessagePipe *recv_pipe, *send_pipe;
@@ -2274,12 +2273,8 @@ static int call_handler(JSContext *ctx, JSValue func)
     ret = JS_Call(ctx, func1, JS_UNDEFINED, 0, NULL);
     JS_FreeValue(ctx, func1);
     r = 0;
-    if (JS_IsException(ret)) {
-        JSRuntime *rt = JS_GetRuntime(ctx);
-        JSThreadState *ts = js_get_thread_state(rt);
-        ts->exc = JS_GetException(ctx);
+    if (JS_IsException(ret))
         r = -1;
-    }
     JS_FreeValue(ctx, ret);
     return r;
 }
@@ -3543,10 +3538,10 @@ static void *worker_func(void *opaque)
         js_std_dump_error(ctx);
     JS_FreeValue(ctx, val);
 
-    JS_FreeValue(ctx, js_std_loop(ctx));
+    js_std_loop(ctx);
 
-    JS_FreeContext(ctx);
     js_std_free_handlers(rt);
+    JS_FreeContext(ctx);
     JS_FreeRuntime(rt);
     return NULL;
 }
@@ -4082,7 +4077,6 @@ void js_std_init_handlers(JSRuntime *rt)
     init_list_head(&ts->port_list);
 
     ts->next_timer_id = 1;
-    ts->exc = JS_UNDEFINED;
 
     js_set_thread_state(rt, ts);
     JS_AddRuntimeFinalizer(rt, js_std_finalize, ts);
@@ -4140,7 +4134,7 @@ static void js_dump_obj(JSContext *ctx, FILE *f, JSValue val)
     }
 }
 
-void js_std_dump_error1(JSContext *ctx, JSValue exception_val)
+static void js_std_dump_error1(JSContext *ctx, JSValue exception_val)
 {
     JSValue val;
     BOOL is_error;
@@ -4178,12 +4172,11 @@ void js_std_promise_rejection_tracker(JSContext *ctx, JSValue promise,
 }
 
 /* main loop which calls the user JS callbacks */
-JSValue js_std_loop(JSContext *ctx)
+int js_std_loop(JSContext *ctx)
 {
     JSRuntime *rt = JS_GetRuntime(ctx);
     JSThreadState *ts = js_get_thread_state(rt);
     JSContext *ctx1;
-    JSValue ret;
     int err;
 
     for(;;) {
@@ -4191,10 +4184,8 @@ JSValue js_std_loop(JSContext *ctx)
         for(;;) {
             err = JS_ExecutePendingJob(JS_GetRuntime(ctx), &ctx1);
             if (err <= 0) {
-                if (err < 0) {
-                    ts->exc = JS_GetException(ctx1);
+                if (err < 0)
                     goto done;
-                }
                 break;
             }
         }
@@ -4203,9 +4194,7 @@ JSValue js_std_loop(JSContext *ctx)
             break;
     }
 done:
-    ret = ts->exc;
-    ts->exc = JS_UNDEFINED;
-    return ret;
+    return JS_HasException(ctx);
 }
 
 /* Wait for a promise and execute pending jobs while waiting for
diff --git a/quickjs-libc.h b/quickjs-libc.h
index f80cf71..19fad58 100644
--- a/quickjs-libc.h
+++ b/quickjs-libc.h
@@ -37,12 +37,11 @@ JSModuleDef *js_init_module_std(JSContext *ctx, const char *module_name);
 JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name);
 JSModuleDef *js_init_module_bjson(JSContext *ctx, const char *module_name);
 void js_std_add_helpers(JSContext *ctx, int argc, char **argv);
-JSValue js_std_loop(JSContext *ctx);
+int js_std_loop(JSContext *ctx);
 JSValue js_std_await(JSContext *ctx, JSValue obj);
 void js_std_init_handlers(JSRuntime *rt);
 void js_std_free_handlers(JSRuntime *rt);
 void js_std_dump_error(JSContext *ctx);
-void js_std_dump_error1(JSContext *ctx, JSValue exception_val);
 uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename);
 int js_module_set_import_meta(JSContext *ctx, JSValue func_val,
                               JS_BOOL use_realpath, JS_BOOL is_main);
diff --git a/run-test262.c b/run-test262.c
index 8261abb..d721d12 100644
--- a/run-test262.c
+++ b/run-test262.c
@@ -1555,12 +1555,9 @@ static int eval_buf(JSContext *ctx, const char *buf, size_t buf_len,
     }
 
     if (local) {
-        JSValue val = js_std_loop(ctx);
-        if (JS_IsException(val)) {
-            js_std_dump_error1(ctx, val);
-            ret = -1;
-        }
-        JS_FreeValue(ctx, val);
+        ret = js_std_loop(ctx);
+        if (ret)
+            js_std_dump_error(ctx);
     }
 
     JS_FreeCString(ctx, error_name);