fix

Author: MaxGraey

std/assembly/util/hash.ts

@@ -73,7 +73,7 @@ function hashStr(key: string): u64 {
     return XXH64_SEED;
   }
   var len = key.length << 1;
-  var h: u64 = XXH64_SEED + XXH64_P5 + u64(len);
+  var h: u64 = 0;
 
   if (len >= 32) {
     let s1 = XXH64_SEED + XXH64_P1 + XXH64_P2;
@@ -105,6 +105,8 @@ function hashStr(key: string): u64 {
 
     h += u64(len);
     len -= i;
+  } else {
+    h = u64(len) + XXH64_SEED + XXH64_P5;
   }
 
   var i = 0;

tests/compiler/std/hash.optimized.wat

@@ -16,12 +16,12 @@
  (start $~start)
  (func $~lib/util/hash/hashStr (param $0 i32)
   (local $1 i32)
-  (local $2 i32)
-  (local $3 i64)
-  (local $4 i32)
-  (local $5 i32)
-  (local $6 i64)
-  (local $7 i64)
+  (local $2 i64)
+  (local $3 i32)
+  (local $4 i64)
+  (local $5 i64)
+  (local $6 i32)
+  (local $7 i32)
   (local $8 i64)
   local.get $0
   i32.eqz
@@ -36,35 +36,30 @@
   i32.shr_u
   i32.const 1
   i32.shl
-  local.tee $2
-  i64.extend_i32_s
-  i64.const 2870177450012600261
-  i64.add
-  local.set $8
-  local.get $2
+  local.tee $3
   i32.const 32
   i32.ge_s
-  if (result i32)
+  if
    i64.const 6983438078262162902
-   local.set $8
+   local.set $2
    i64.const -4417276706812531889
-   local.set $7
+   local.set $4
    i64.const 7046029288634856825
-   local.set $6
-   local.get $2
+   local.set $5
+   local.get $3
    i32.const 32
    i32.sub
-   local.set $2
+   local.set $3
    loop $while-continue|0
-    local.get $2
-    local.get $5
+    local.get $3
+    local.get $6
     i32.ge_s
     if
-     local.get $8
+     local.get $2
      local.get $0
-     local.get $5
+     local.get $6
      i32.add
-     local.tee $4
+     local.tee $7
      i64.load
      i64.const -4417276706812531889
      i64.mul
@@ -73,9 +68,9 @@
      i64.rotl
      i64.const -7046029288634856825
      i64.mul
-     local.set $8
-     local.get $7
+     local.set $2
      local.get $4
+     local.get $7
      i64.load offset=8
      i64.const -4417276706812531889
      i64.mul
@@ -84,9 +79,9 @@
      i64.rotl
      i64.const -7046029288634856825
      i64.mul
-     local.set $7
-     local.get $3
-     local.get $4
+     local.set $4
+     local.get $8
+     local.get $7
      i64.load offset=16
      i64.const -4417276706812531889
      i64.mul
@@ -95,9 +90,9 @@
      i64.rotl
      i64.const -7046029288634856825
      i64.mul
-     local.set $3
-     local.get $6
-     local.get $4
+     local.set $8
+     local.get $5
+     local.get $7
      i64.load offset=24
      i64.const -4417276706812531889
      i64.mul
@@ -106,32 +101,32 @@
      i64.rotl
      i64.const -7046029288634856825
      i64.mul
-     local.set $6
-     local.get $5
+     local.set $5
+     local.get $6
      i32.const 32
      i32.add
-     local.set $5
+     local.set $6
      br $while-continue|0
     end
    end
-   local.get $2
+   local.get $3
    i64.extend_i32_s
-   local.get $8
+   local.get $2
    i64.const 1
    i64.rotl
-   local.get $7
+   local.get $4
    i64.const 7
    i64.rotl
    i64.add
-   local.get $3
+   local.get $8
    i64.const 12
    i64.rotl
    i64.add
-   local.get $6
+   local.get $5
    i64.const 18
    i64.rotl
    i64.add
-   local.get $8
+   local.get $2
    i64.const -4417276706812531889
    i64.mul
    i64.const 31
@@ -143,7 +138,7 @@
    i64.mul
    i64.const -8796714831421723037
    i64.add
-   local.get $7
+   local.get $4
    i64.const -4417276706812531889
    i64.mul
    i64.const 31
@@ -155,7 +150,7 @@
    i64.mul
    i64.const -8796714831421723037
    i64.add
-   local.get $3
+   local.get $8
    i64.const -4417276706812531889
    i64.mul
    i64.const 31
@@ -167,7 +162,7 @@
    i64.mul
    i64.const -8796714831421723037
    i64.add
-   local.get $6
+   local.get $5
    i64.const -4417276706812531889
    i64.mul
    i64.const 31
@@ -180,22 +175,28 @@
    i64.const -8796714831421723037
    i64.add
    i64.add
-   local.set $8
-   local.get $2
-   local.get $5
+   local.set $2
+   local.get $3
+   local.get $6
    i32.sub
+   local.set $3
   else
-   local.get $2
+   local.get $3
+   i64.extend_i32_s
+   i64.const 2870177450012600261
+   i64.add
+   local.set $2
   end
+  local.get $3
   i32.const 8
   i32.sub
-  local.set $2
+  local.set $3
   loop $while-continue|1
    local.get $1
-   local.get $2
+   local.get $3
    i32.le_s
    if
-    local.get $8
+    local.get $2
     local.get $0
     local.get $1
     i32.add
@@ -213,21 +214,21 @@
     i64.mul
     i64.const -8796714831421723037
     i64.add
-    local.set $8
+    local.set $2
     local.get $1
     i32.const 8
     i32.add
     local.set $1
     br $while-continue|1
    end
   end
-  local.get $2
+  local.get $3
   local.get $1
   i32.const 4
   i32.add
   i32.ge_s
   if
-   local.get $8
+   local.get $2
    local.get $0
    local.get $1
    i32.add
@@ -241,18 +242,18 @@
    i64.mul
    i64.const 1609587929392839161
    i64.add
-   local.set $8
+   local.set $2
    local.get $1
    i32.const 4
    i32.add
    local.set $1
   end
   loop $while-continue|2
    local.get $1
-   local.get $2
+   local.get $3
    i32.lt_s
    if
-    local.get $8
+    local.get $2
     local.get $0
     local.get $1
     i32.add
@@ -264,7 +265,7 @@
     i64.rotl
     i64.const -7046029288634856825
     i64.mul
-    local.set $8
+    local.set $2
     local.get $1
     i32.const 1
     i32.add

tests/compiler/std/hash.untouched.wat

@@ -65,11 +65,6 @@
   i32.shl
   local.set $2
   i64.const 0
-  i64.const 2870177450012600261
-  i64.add
-  local.get $2
-  i64.extend_i32_s
-  i64.add
   local.set $3
   local.get $2
   i32.const 32
@@ -284,6 +279,14 @@
    local.get $7
    i32.sub
    local.set $2
+  else
+   local.get $2
+   i64.extend_i32_s
+   i64.const 0
+   i64.add
+   i64.const 2870177450012600261
+   i64.add
+   local.set $3
   end
   i32.const 0
   local.set $11