rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

registers in a VINDEXED expression must be freed in order

This commit is contained in:
Roberto Ierusalimschy 2017-04-25 15:28:25 -03:00
parent cb3d5dce30
commit 6dbae1b5d9
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lcode.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lcode.c,v 2.113 2017/04/20 19:53:55 roberto Exp roberto $ ** $Id: lcode.c,v 2.114 2017/04/24 20:26:39 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -391,6 +391,21 @@ static void freereg (FuncState *fs, int reg) {
} }
/*
** Free two registers in proper order
*/
static void freeregs (FuncState *fs, int r1, int r2) {
if (r1 > r2) {
freereg(fs, r1);
freereg(fs, r2);
}
else {
freereg(fs, r2);
freereg(fs, r1);
}
}
/* /*
** Free register used by expression 'e' (if any) ** Free register used by expression 'e' (if any)
*/ */
@ -407,14 +422,7 @@ static void freeexp (FuncState *fs, expdesc *e) {
static void freeexps (FuncState *fs, expdesc *e1, expdesc *e2) { static void freeexps (FuncState *fs, expdesc *e1, expdesc *e2) {
int r1 = (e1->k == VNONRELOC) ? e1->u.info : -1; int r1 = (e1->k == VNONRELOC) ? e1->u.info : -1;
int r2 = (e2->k == VNONRELOC) ? e2->u.info : -1; int r2 = (e2->k == VNONRELOC) ? e2->u.info : -1;
if (r1 > r2) { freeregs(fs, r1, r2);
freereg(fs, r1);
freereg(fs, r2);
}
else {
freereg(fs, r2);
freereg(fs, r1);
}
} }
@ -574,13 +582,13 @@ void luaK_dischargevars (FuncState *fs, expdesc *e) {
} }
case VINDEXED: { case VINDEXED: {
OpCode op; OpCode op;
freereg(fs, e->u.ind.idx);
if (e->u.ind.vt == VLOCAL) { /* is 't' in a register? */ if (e->u.ind.vt == VLOCAL) { /* is 't' in a register? */
freereg(fs, e->u.ind.t); freeregs(fs, e->u.ind.t, e->u.ind.idx);
op = OP_GETTABLE; op = OP_GETTABLE;
} }
else { else {
lua_assert(e->u.ind.vt == VUPVAL); lua_assert(e->u.ind.vt == VUPVAL);
freereg(fs, e->u.ind.idx);
op = OP_GETTABUP; /* 't' is in an upvalue */ op = OP_GETTABUP; /* 't' is in an upvalue */
} }
e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx); e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx);