Revert "hashtables: make hash-combine use fixnum primitives."

This reverts commit 390dd23261ab6c31bfd38a85048095ca22020643.

diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index 33871d24574d7e3ae56c1e6495103ac5fdce1a91..13b65680bb257c4077a22f26faab71ec91bce8b4 100644 (file)
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -188,9 +188,7 @@ M: hashtable assoc-like
 ! magic number is 2^29/phi instead of 2^32/phi
 ! due to max fixnum value on 32-bit machines
 : hash-combine ( hash1 hash2 -- newhash )
-    [ >fixnum ] bi@ [ 0x13c6ef37 fixnum+fast ] dip
-    [ 6 fixnum-shift-fast ] [ -2 fixnum-shift-fast ] bi
-    fixnum+fast fixnum+fast ; inline
+    [ 0x13c6ef37 + ] dip [ 6 shift ] [ -2 shift ] bi + + ; inline
 
 ERROR: malformed-hashtable-pair seq pair ;