diff options
author | Mike Pall <mike> | 2019-12-08 19:47:00 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2019-12-08 19:47:00 +0100 |
commit | de48d000941f58a8d4d816e9d227de8a4f3c9de6 (patch) | |
tree | b038ad8fff48d7e161d48093bd667ee10dfa652b | |
parent | 324aef08d9b178aa0640fb8ae5ac0a361ec72716 (diff) | |
download | luajit2-de48d000941f58a8d4d816e9d227de8a4f3c9de6.tar.gz |
Fix hash table chaining (again).
Thanks to Peter Cawley.
-rw-r--r-- | src/lj_tab.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lj_tab.c b/src/lj_tab.c index f2f3c0b0..2ff5eb0d 100644 --- a/src/lj_tab.c +++ b/src/lj_tab.c @@ -452,8 +452,7 @@ TValue *lj_tab_newkey(lua_State *L, GCtab *t, cTValue *key) /* Rechain pseudo-resurrected string keys with colliding hashes. */ while (nextnode(freenode)) { Node *nn = nextnode(freenode); - if (tvisstr(&nn->key) && !tvisnil(&nn->val) && - hashstr(t, strV(&nn->key)) == n) { + if (!tvisnil(&nn->val) && hashkey(t, &nn->key) == n) { freenode->next = nn->next; nn->next = n->next; setmref(n->next, nn); @@ -466,9 +465,9 @@ TValue *lj_tab_newkey(lua_State *L, GCtab *t, cTValue *key) ** any string key that's currently in a non-main positions. */ while ((nn = nextnode(freenode))) { - if (tvisstr(&nn->key) && !tvisnil(&nn->val)) { - Node *mn = hashstr(t, strV(&nn->key)); - if (mn != freenode) { + if (!tvisnil(&nn->val)) { + Node *mn = hashkey(t, &nn->key); + if (mn != freenode && mn != nn) { freenode->next = nn->next; nn->next = mn->next; setmref(mn->next, nn); |