From 40d0d9d2b84937932ac37bb07919bef4bfc5ddaf Mon Sep 17 00:00:00 2001 From: GenericHeroGuy <86008856+GenericHeroGuy@users.noreply.github.com> Date: Sun, 2 Mar 2025 20:39:49 +0100 Subject: [PATCH] Properly constant-fold (0 or 123) But not (0 and 123). Yay bug compatibility! --- src/bluajit/lj_parse.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bluajit/lj_parse.c b/src/bluajit/lj_parse.c index a22b61f28..bf83c521a 100644 --- a/src/bluajit/lj_parse.c +++ b/src/bluajit/lj_parse.c @@ -782,7 +782,11 @@ static void bcemit_branch_f(FuncState *fs, ExpDesc *e) { BCPos pc; expr_discharge(fs, e); - if (e->k == VKNIL || e->k == VKFALSE) + if (e->k == VKNIL || e->k == VKFALSE +#if LJ_INTONLY + || (expr_isnumk_nojump(e) && expr_intV(e) == 0) +#endif + ) pc = NO_JMP; /* Never jump. */ else if (e->k == VJMP) pc = e->u.s.info;