From 28b90976202fa27e7ba20e1906f49e40179e1bf8 Mon Sep 17 00:00:00 2001
From: narimiran <narimiran@disroot.org>
Date: Sun, 12 May 2019 09:32:22 +0200
Subject: [PATCH] try to make it bootstrap

---
 lib/pure/hashes.nim | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/pure/hashes.nim b/lib/pure/hashes.nim
index 627c512c7e51..8b66c9a1ecf3 100644
--- a/lib/pure/hashes.nim
+++ b/lib/pure/hashes.nim
@@ -139,9 +139,9 @@ proc hash*[T: Ordinal](x: T): Hash {.inline.} =
   ## Efficient hashing of other ordinal types (e.g. enums).
   result = ord(x)
 
-template singleByteHashImpl(result: Hash, x: typed, start, stop: int) =
+proc singleByteHashImpl[T](h: var Hash, x: openArray[T], start, stop: int) {.inline.} =
   for i in start .. stop:
-    result = result !& hash(x[i])
+    h = h !& hash(x[i])
 
 template multiByteHashImpl(result: Hash, x: typed, start, stop: int) =
   let stepSize = IntSize div sizeof(x[start])
@@ -179,12 +179,21 @@ proc hash*(x: cstring): Hash =
     doAssert hash(cstring"abracadabra") != hash(cstring"AbracadabrA")
 
   when nimvm:
-    var i = 0
-    while x[i] != '\0':
+    var j = 0
+    while x[j] != '\0':
+      result = result !& ord(x[j])
+      inc j
+  else:
+    var
+      i = 0
+      l = len(x)
+    while i < l - IntSize:
+      let n = cast[ptr Hash](unsafeAddr x[i])[]
+      result = result !& n
+      i += IntSize
+    while i < l:
       result = result !& ord(x[i])
       inc i
-  else:
-    multiByteHashImpl(result, x, 0, high(x))
   result = !$result
 
 proc hash*(sBuf: string, sPos, ePos: int): Hash =