LuaJIT-2.0.0-beta2 hotfix #2v2.0.0-beta2-hotfix2

Fix lua_tocfunction().
Fix cutoff register in JMP bytecode for some conditional expressions.
Fix PHI marking algorithm for references from variant slots.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lj_parse.c b/src/lj_parse.c
index 663525ab..000772fe 100644
--- a/src/lj_parse.c
+++ b/src/lj_parse.c
@@ -636,6 +636,7 @@ static void invertjump(FuncState *fs, ExpDesc *e)
 
 static BCPos jumponcond(FuncState *fs, ExpDesc *e, int cond)
 {
+  BCPos pc;
   if (e->k == VRELOCABLE) {
     BCIns *i = bcptr(fs, e);
     if (bc_op(*i) == BC_NOT) {
@@ -648,9 +649,10 @@ static BCPos jumponcond(FuncState *fs, ExpDesc *e, int cond)
     reserveregs(fs, 1);
     discharge2reg(fs, e, fs->freereg-1);
   }
-  freeexp(fs, e);
   emitAD(fs, cond ? BC_ISTC : BC_ISFC, NO_REG, e->u.s.info);
-  return emit_jump(fs);
+  pc = emit_jump(fs);
+  freeexp(fs, e);
+  return pc;
 }
 
 static void goiftrue(FuncState *fs, ExpDesc *e)