diff options
Diffstat (limited to 'src/lj_parse.c')
-rw-r--r-- | src/lj_parse.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lj_parse.c b/src/lj_parse.c index ffd11b3b..3370296f 100644 --- a/src/lj_parse.c +++ b/src/lj_parse.c | |||
@@ -1529,23 +1529,11 @@ static void fs_fixup_var(LexState *ls, GCproto *pt, uint8_t *p, size_t ofsvar) | |||
1529 | 1529 | ||
1530 | #endif | 1530 | #endif |
1531 | 1531 | ||
1532 | /* Check if bytecode op returns. */ | ||
1533 | static int bcopisret(BCOp op) | ||
1534 | { | ||
1535 | switch (op) { | ||
1536 | case BC_CALLMT: case BC_CALLT: | ||
1537 | case BC_RETM: case BC_RET: case BC_RET0: case BC_RET1: | ||
1538 | return 1; | ||
1539 | default: | ||
1540 | return 0; | ||
1541 | } | ||
1542 | } | ||
1543 | |||
1544 | /* Fixup return instruction for prototype. */ | 1532 | /* Fixup return instruction for prototype. */ |
1545 | static void fs_fixup_ret(FuncState *fs) | 1533 | static void fs_fixup_ret(FuncState *fs) |
1546 | { | 1534 | { |
1547 | BCPos lastpc = fs->pc; | 1535 | BCPos lastpc = fs->pc; |
1548 | if (lastpc <= fs->lasttarget || !bcopisret(bc_op(fs->bcbase[lastpc-1].ins))) { | 1536 | if (lastpc <= fs->lasttarget || !bc_isret_or_tail(bc_op(fs->bcbase[lastpc-1].ins))) { |
1549 | if ((fs->bl->flags & FSCOPE_UPVAL)) | 1537 | if ((fs->bl->flags & FSCOPE_UPVAL)) |
1550 | bcemit_AJ(fs, BC_UCLO, 0, 0); | 1538 | bcemit_AJ(fs, BC_UCLO, 0, 0); |
1551 | bcemit_AD(fs, BC_RET0, 0, 1); /* Need final return. */ | 1539 | bcemit_AD(fs, BC_RET0, 0, 1); /* Need final return. */ |