Merge branch 'master' into v2.1

2013-10-14 19:34:06 +02:00
parent 4ccb2dd3bb 5d25645a21
commit d0b48ec996
4 changed files with 18 additions and 1 deletions
--- a/src/lj_tab.c
+++ b/src/lj_tab.c
@@ -357,6 +357,13 @@ static void rehashtab(lua_State *L, GCtab *t, cTValue *ek)
  resizetab(L, t, asize, hsize2hbits(total));
 }

+#if LJ_HASFFI
+void lj_tab_rehash(lua_State *L, GCtab *t)
+{
+  rehashtab(L, t, niltv(L));
+}
+#endif
+
 void lj_tab_reasize(lua_State *L, GCtab *t, uint32_t nasize)
 {
  resizetab(L, t, nasize+1, t->hmask > 0 ? lj_fls(t->hmask)+1 : 0);