shithub: libmujs

Info  •  Files  •  Log  •  Branches

Rework try macros to simplify setjmp expression.

According to spec, setjmp is only allowed to be called in very restricted
contexts. A comma expression is not one of them; which puts it in danger
of compiler optimizations going wrong.

--- a/jsi.h

+++ b/jsi.h

@@ -120,10 +120,10 @@

 void js_savetry(js_State *J, js_Instruction *pc);

 #define js_trypc(J, PC) \

-	(js_savetry(J, PC), setjmp(J->trybuf[J->trytop++].buf))

+	setjmp((js_savetry(J, PC), J->trybuf[J->trytop++].buf))

 #define js_try(J) \

-	(js_savetry(J, NULL), setjmp(J->trybuf[J->trytop++].buf))

+	setjmp((js_savetry(J, NULL), J->trybuf[J->trytop++].buf))

 #define js_endtry(J) \

 	(--J->trytop)