aboutsummaryrefslogtreecommitdiff
path: root/src/lj_tab.c
diff options
context:
space:
mode:
authorMike Pall <mike>2013-10-14 19:34:06 +0200
committerMike Pall <mike>2013-10-14 19:34:06 +0200
commitd0b48ec996cb20f05f5c7b0059eddf0da9198de0 (patch)
treeaadf4957fa380fc70947267218e5a5bc91c396f9 /src/lj_tab.c
parent4ccb2dd3bb576f742f987cf0027214e733325404 (diff)
parent5d25645a210f32dddecde9c50afb14f9ee63e180 (diff)
downloadluajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.tar.gz
luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.tar.bz2
luajit-d0b48ec996cb20f05f5c7b0059eddf0da9198de0.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_tab.c')
-rw-r--r--src/lj_tab.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lj_tab.c b/src/lj_tab.c
index 496904ee..37a3c32c 100644
--- a/src/lj_tab.c
+++ b/src/lj_tab.c
@@ -357,6 +357,13 @@ static void rehashtab(lua_State *L, GCtab *t, cTValue *ek)
357 resizetab(L, t, asize, hsize2hbits(total)); 357 resizetab(L, t, asize, hsize2hbits(total));
358} 358}
359 359
360#if LJ_HASFFI
361void lj_tab_rehash(lua_State *L, GCtab *t)
362{
363 rehashtab(L, t, niltv(L));
364}
365#endif
366
360void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize) 367void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize)
361{ 368{
362 resizetab(L, t, nasize+1, t->hmask > 0 ? lj_fls(t->hmask)+1 : 0); 369 resizetab(L, t, nasize+1, t->hmask > 0 ? lj_fls(t->hmask)+1 : 0);