Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/lj_str.c b/src/lj_str.c
- index a6a9364..37d2398 100644
- --- a/src/lj_str.c
- +++ b/src/lj_str.c
- @@ -130,7 +130,19 @@ GCstr *lj_str_new(lua_State *L, const char *str, size_t lenx)
- lj_err_msg(L, LJ_ERR_STROV);
- g = G(L);
- /* Compute string hash. Constants taken from lookup3 hash by Bob Jenkins. */
- - if (len >= 4) { /* Caveat: unaligned access! */
- + if (len >= 12) { /* Caveat: unaligned access! */
- + MSize i = (len-1)/8;
- + const char *ss;
- + a = lj_getu32(str+len-8);
- + b = lj_getu32(str+len-4);
- + ss = str;
- + for (; i; i--, ss += 8) {
- + MSize v = lj_getu32(ss), vv = lj_getu32(ss+4);
- + h = lj_rol(h ^ a, 17) + (b ^ 0xdeadbeef);
- + a -= v; a = lj_rol(a, 13);
- + b -= vv; b = lj_rol(b, 11);
- + }
- + } else if (len >= 4) { /* Caveat: unaligned access! */
- a = lj_getu32(str);
- h ^= lj_getu32(str+len-4);
- b = lj_getu32(str+(len>>1)-2);
- @@ -152,7 +164,7 @@ GCstr *lj_str_new(lua_State *L, const char *str, size_t lenx)
- if (LJ_LIKELY((((uintptr_t)str+len-1) & (LJ_PAGESIZE-1)) <= LJ_PAGESIZE-4)) {
- while (o != NULL) {
- GCstr *sx = gco2str(o);
- - if (sx->len == len && str_fastcmp(str, strdata(sx), len) == 0) {
- + if (sx->hash == h && sx->len == len && str_fastcmp(str, strdata(sx), len) == 0) {
- /* Resurrect if dead. Can only happen with fixstring() (keywords). */
- if (isdead(g, o)) flipwhite(o);
- return sx; /* Return existing string. */
- @@ -162,7 +174,7 @@ GCstr *lj_str_new(lua_State *L, const char *str, size_t lenx)
- } else { /* Slow path: end of string is too close to a page boundary. */
- while (o != NULL) {
- GCstr *sx = gco2str(o);
- - if (sx->len == len && memcmp(str, strdata(sx), len) == 0) {
- + if (sx->hash == h && sx->len == len && memcmp(str, strdata(sx), len) == 0) {
- /* Resurrect if dead. Can only happen with fixstring() (keywords). */
- if (isdead(g, o)) flipwhite(o);
- return sx; /* Return existing string. */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
