DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall
2017-03-08 23:04:46 +01:00
parent a25c0b99b8 f50bf7585a
commit d3e36e7920
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lj_parse.c
View File

@@ -1282,12 +1282,14 @@ static void fscope_end(FuncState *fs)
MSize idx = gola_new(ls, NAME_BREAK, VSTACK_LABEL, fs->pc);
ls->vtop = idx; /* Drop break label immediately. */
gola_resolve(ls, bl, idx);
} else { /* Need the fixup step to propagate the breaks. */
gola_fixup(ls, bl);
return;
} /* else: need the fixup step to propagate the breaks. */
} else if (!(bl->flags & FSCOPE_GOLA)) {
return;
}
}
if ((bl->flags & FSCOPE_GOLA)) {
gola_fixup(ls, bl);
}
gola_fixup(ls, bl);
}
/* Mark scope as having an upvalue. */