gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Redesign of prototype generation, part 2: late init of chunkname.

Browse Source
This commit is contained in:
Mike Pall 2010-02-08 05:27:43 +01:00
parent 60b5af4422
commit 48d93d8c84
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lj_lex.c
View File

@ -333,10 +333,6 @@ void lj_lex_setup(lua_State *L, LexState *ls)
setstrV(L, L->top++, lj_err_str(L, LJ_ERR_XBCLOAD)); setstrV(L, L->top++, lj_err_str(L, LJ_ERR_XBCLOAD));
lj_err_throw(L, LUA_ERRSYNTAX); lj_err_throw(L, LUA_ERRSYNTAX);
} }
/* This is an unanchored GCstr before it's stored in the prototype.
** Do this last since next() calls the reader which may call the GC.
*/
ls->chunkname = lj_str_newz(L, ls->chunkarg);
} }
/* Cleanup lexer state. */ /* Cleanup lexer state. */

7
src/lj_parse.c
View File

@ -1171,6 +1171,7 @@ static GCproto *fs_finish(LexState *ls, BCLine line)
} }
/* Initialize prototype fields. */ /* Initialize prototype fields. */
setgcref(pt->chunkname, obj2gco(ls->chunkname));
pt->flags = fs->flags; pt->flags = fs->flags;
pt->framesize = fs->framesize; pt->framesize = fs->framesize;
pt->linedefined = fs->linedefined; pt->linedefined = fs->linedefined;
@ -1213,7 +1214,6 @@ static void fs_init(LexState *ls, FuncState *fs, BCLine line)
fs->nactvar = 0; fs->nactvar = 0;
fs->nuv = 0; fs->nuv = 0;
fs->bl = NULL; fs->bl = NULL;
setgcref(pt->chunkname, obj2gco(ls->chunkname));
fs->flags = 0; fs->flags = 0;
fs->framesize = 2; /* Minimum frame size. */ fs->framesize = 2; /* Minimum frame size. */
fs->linedefined = line; fs->linedefined = line;
@ -2205,6 +2205,10 @@ GCproto *lj_parse(LexState *ls)
{ {
struct FuncState fs; struct FuncState fs;
GCproto *pt; GCproto *pt;
lua_State *L = ls->L;
ls->chunkname = lj_str_newz(L, ls->chunkarg);
setstrV(L, L->top, ls->chunkname); /* Anchor chunkname string. */
incr_top(L);
ls->level = 0; ls->level = 0;
fs_init(ls, &fs, 0); fs_init(ls, &fs, 0);
fs.flags |= PROTO_IS_VARARG; /* Main chunk is always a vararg func. */ fs.flags |= PROTO_IS_VARARG; /* Main chunk is always a vararg func. */
@ -2213,6 +2217,7 @@ GCproto *lj_parse(LexState *ls)
if (ls->token != TK_eof) if (ls->token != TK_eof)
err_token(ls, TK_eof); err_token(ls, TK_eof);
pt = fs_finish(ls, ls->linenumber); pt = fs_finish(ls, ls->linenumber);
L->top--; /* Drop chunkname. */
lua_assert(fs.prev == NULL); lua_assert(fs.prev == NULL);
lua_assert(ls->fs == NULL); lua_assert(ls->fs == NULL);
lua_assert(pt->sizeuv == 0); lua_assert(pt->sizeuv == 0);