nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug in some short-circuit optimizations

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2011-01-31 12:28:41 -02:00
parent c4ea0c3b29
commit 026a7e92be
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lcode.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lcode.c,v 2.48 2010/07/02 20:42:40 roberto Exp roberto $ ** $Id: lcode.c,v 2.49 2010/07/07 16:27:29 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -603,21 +603,14 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) {
int pc; /* pc of last jump */ int pc; /* pc of last jump */
luaK_dischargevars(fs, e); luaK_dischargevars(fs, e);
switch (e->k) { switch (e->k) {
case VK: case VKNUM: case VTRUE: {
pc = NO_JUMP; /* always true; do nothing */
break;
}
case VJMP: { case VJMP: {
invertjump(fs, e); invertjump(fs, e);
pc = e->u.info; pc = e->u.info;
break; break;
} }
case VFALSE: { case VK: case VKNUM: case VTRUE: {
if (!hasjumps(e)) { pc = NO_JUMP; /* always true; do nothing */
pc = luaK_jump(fs); /* always jump */ break;
break;
}
/* else go through */
} }
default: { default: {
pc = jumponcond(fs, e, 0); pc = jumponcond(fs, e, 0);
@@ -634,20 +627,13 @@ static void luaK_goiffalse (FuncState *fs, expdesc *e) {
int pc; /* pc of last jump */ int pc; /* pc of last jump */
luaK_dischargevars(fs, e); luaK_dischargevars(fs, e);
switch (e->k) { switch (e->k) {
case VNIL: case VFALSE: {
pc = NO_JUMP; /* always false; do nothing */
break;
}
case VJMP: { case VJMP: {
pc = e->u.info; pc = e->u.info;
break; break;
} }
case VTRUE: { case VNIL: case VFALSE: {
if (!hasjumps(e)) { pc = NO_JUMP; /* always false; do nothing */
pc = luaK_jump(fs); /* always jump */ break;
break;
}
/* else go through */
} }
default: { default: {
pc = jumponcond(fs, e, 1); pc = jumponcond(fs, e, 1);