Merge pull request #2243 from IgorStepanov/typeinfo-gethash-tohash

use core.internal.hash for TypeInfo.getHash

Author: wilzbach

mak/DOCS

@@ -140,7 +140,6 @@ DOCS=\
     $(DOCDIR)\rt_util_container_common.html \
     $(DOCDIR)\rt_util_container_hashtab.html \
     $(DOCDIR)\rt_util_container_treap.html \
-    $(DOCDIR)\rt_util_hash.html \
     $(DOCDIR)\rt_util_random.html \
     $(DOCDIR)\rt_util_typeinfo.html \
     $(DOCDIR)\rt_util_utf.html \

mak/SRCS

@@ -347,7 +347,6 @@ SRCS=\
 	src\rt\backtrace\macho.d \
 	\
 	src\rt\util\array.d \
-	src\rt\util\hash.d \
 	src\rt\util\random.d \
 	src\rt\util\typeinfo.d \
 	src\rt\util\utf.d \

src/core/internal/hash.d

@@ -13,7 +13,7 @@ import core.internal.convert;
 
 // If true ensure that positive zero and negative zero have the same hash.
 // typeid(float).getHash does this but historically hashOf(float) did not.
-private enum floatCoalesceZeroes = false;
+private enum floatCoalesceZeroes = true;
 // If true ensure that all NaNs of the same floating point type have the same hash.
 // typeid(float).getHash does not do this but historically hashOf(float) did.
 private enum floatCoalesceNaNs = true;
@@ -47,12 +47,7 @@ size_t hashOf(T)(auto ref T val, size_t seed = 0) if (is(T == enum))
 //CTFE ready (depends on base type). Can be merged with dynamic array hash
 size_t hashOf(T)(auto ref T val, size_t seed = 0) if (!is(T == enum) && __traits(isStaticArray, T))
 {
-    size_t cur_hash = seed;
-    foreach (ref cur; val)
-    {
-        cur_hash = hashOf(cur, cur_hash);
-    }
-    return cur_hash;
+    return hashOf(val[], seed);
 }
 
 //dynamic array hash
@@ -64,14 +59,15 @@ if (!is(T == enum) && !is(T : typeof(null)) && is(T S: S[]) && !__traits(isStati
     static if (is(ElementType == interface) || is(ElementType == class) ||
                    (is(ElementType == struct) && !isNonReference!ElementType) ||
                    ((is(ElementType == struct) || is(ElementType == union))
-                       && is(typeof(val[0].toHash()) == size_t)))
+                       && is(typeof(val[0].toHash()) == size_t)) ||
+                   ((floatCoalesceZeroes || floatCoalesceNaNs) && __traits(isFloating, ElementType)))
     //class or interface array or struct array with toHash(); CTFE depend on toHash() method
     //also do this for arrays of structs whose hashes would be calculated in a memberwise fashion
     {
         size_t hash = seed;
         foreach (o; val)
         {
-            hash = hashOf(o, hash);
+            hash = hashOf(hashOf(o), hash); // double hashing because TypeInfo.getHash doesn't allow to pass seed value
         }
         return hash;
     }
@@ -109,9 +105,16 @@ size_t hashOf(T)(scope const T val, size_t seed = 0) if (!is(T == enum) && __tra
         {
             import core.internal.traits : Unqual;
             Unqual!T data = val;
-            // Zero coalescing not supported for deprecated complex types.
+            // +0.0 and -0.0 become the same.
             static if (floatCoalesceZeroes && is(typeof(data = 0)))
-                if (data == 0) data = 0; // +0.0 and -0.0 become the same.
+                if (data == 0) data = 0;
+            static if (floatCoalesceZeroes && is(typeof(data = 0.0i)))
+                if (data == 0.0i) data = 0.0i;
+            static if (floatCoalesceZeroes && is(typeof(data = 0.0 + 0.0i)))
+            {
+                if (data.re == 0.0) data = 0.0 + (data.im * 1.0i);
+                if (data.im == 0.0i) data = data.re + 0.0i;
+            }
             static if (floatCoalesceNaNs)
                 if (data != data) data = T.nan; // All NaN patterns become the same.
         }
@@ -313,6 +316,12 @@ unittest
         int* a = null;
     }
 
+    static struct Plain
+    {
+        int a = 1;
+        int b = 2;
+    }
+
     interface IBoo
     {
         void boo();
@@ -362,7 +371,8 @@ unittest
     enum realexpr = 7.88;
     enum raexpr = [8.99L+86i, 3.12L+99i, 5.66L+12i];
     enum nullexpr = null;
-
+    enum plstr = Plain();
+    enum plarrstr = [Plain(), Plain(), Plain()];
     //No CTFE:
     Boom rstructexpr = Boom();
     Boom[] rstrarrexpr = [Boom(), Boom(), Boom()];
@@ -406,6 +416,9 @@ unittest
     enum h28 = realexpr.hashOf();
     enum h29 = raexpr.hashOf();
     enum h30 = nullexpr.hashOf();
+    enum h31 = plstr.hashOf();
+    enum h32 = plarrstr.hashOf();
+    enum h33 = hashOf(cast(Plain[3])plarrstr);
 
     auto v1 = dexpr;
     auto v2 = fexpr;
@@ -431,14 +444,17 @@ unittest
     auto v22 = cast(IBoo[3])[cast(IBoo)new Boo, cast(IBoo)new Boo, cast(IBoo)new Boo];
     auto v23 = cast(Bar[3])vsaexpr;
     auto v30 = null;
+    auto v31 = plstr;
+    auto v32 = plarrstr;
+    auto v33 = cast(Plain[3])plarrstr;
 
     //NO CTFE:
-    /*auto v24 = rstructexpr;
+    auto v24 = rstructexpr;
     auto v25 = rstrarrexpr;
     auto v26 = dgexpr;
     auto v27 = ptrexpr;
     auto v28 = realexpr;
-    auto v29 = raexpr;*/
+    auto v29 = raexpr;
 
     //runtime hashes
     auto rth1 = hashOf(v1);
@@ -465,13 +481,17 @@ unittest
     auto rth22 = hashOf(v22);
     auto rth23 = hashOf(v23);
     auto rth30 = hashOf(v30);
-    /*//NO CTFE:
+    //NO CTFE:
     auto rth24 = hashOf(v24);
     auto rth25 = hashOf(v25);
     auto rth26 = hashOf(v26);
     auto rth27 = hashOf(v27);
     auto rth28 = hashOf(v28);
-    auto rth29 = hashOf(v29);*/
+    auto rth29 = hashOf(v29);
+
+    auto rth31 = hashOf(v31);
+    auto rth32 = hashOf(v32);
+    auto rth33 = hashOf(v33);
 
     assert(h1 == rth1);
     assert(h2 == rth2);
@@ -503,8 +523,84 @@ unittest
     assert(h28 == rth28);
     assert(h29 == rth29);*/
     assert(h30 == rth30);
+    assert(h31 == rth31);
+    assert(h32 == rth32);
+    assert(h33 == rth33);
 
     assert(hashOf(null, 0) != hashOf(null, 123456789)); // issue 18932
+
+    static size_t tiHashOf(T)(T var)
+    {
+        return typeid(T).getHash(&var);
+    }
+
+    auto tih1 = tiHashOf(v1);
+    auto tih2 = tiHashOf(v2);
+    auto tih3 = tiHashOf(v3);
+    auto tih4 = tiHashOf(v4);
+    auto tih5 = tiHashOf(v5);
+    auto tih6 = tiHashOf(v6);
+    auto tih7 = tiHashOf(v7);
+    auto tih8 = tiHashOf(v8);
+    auto tih9 = tiHashOf(v9);
+    auto tih10 = tiHashOf(v10);
+    auto tih11 = tiHashOf(v11);
+    auto tih12 = tiHashOf(v12);
+    auto tih13 = tiHashOf(v13);
+    auto tih14 = tiHashOf(v14);
+    auto tih15 = tiHashOf(v15);
+    auto tih16 = tiHashOf(v16);
+    auto tih17 = tiHashOf(v17);
+    auto tih18 = tiHashOf(v18);
+    auto tih19 = tiHashOf(v19);
+    auto tih20 = tiHashOf(v20);
+    auto tih21 = tiHashOf(v21);
+    auto tih22 = tiHashOf(v22);
+    auto tih23 = tiHashOf(v23);
+    auto tih24 = tiHashOf(v24);
+    auto tih25 = tiHashOf(v25);
+    auto tih26 = tiHashOf(v26);
+    auto tih27 = tiHashOf(v27);
+    auto tih28 = tiHashOf(v28);
+    auto tih29 = tiHashOf(v29);
+    auto tih30 = tiHashOf(v30);
+    auto tih31 = tiHashOf(v31);
+    auto tih32 = tiHashOf(v32);
+    auto tih33 = tiHashOf(v33);
+
+    assert(tih1 == rth1);
+    assert(tih2 == rth2);
+    assert(tih3 == rth3);
+    assert(tih4 == rth4);
+    assert(tih5 == rth5);
+    assert(tih6 == rth6);
+    assert(tih7 == rth7);
+    assert(tih8 == rth8);
+    assert(tih9 == rth9);
+    //assert(tih10 == rth10); // need compiler-generated __xtoHash changes
+    assert(tih11 == rth11);
+    assert(tih12 == rth12);
+    assert(tih13 == rth13);
+    assert(tih14 == rth14);
+    assert(tih15 == rth15);
+    assert(tih16 == rth16);
+    assert(tih17 == rth17);
+    assert(tih18 == rth18);
+    //assert(tih19 == rth19); // need compiler-generated __xtoHash changes
+    assert(tih20 == rth20);
+    assert(tih21 == rth21);
+    assert(tih22 == rth22);
+    //assert(tih23 == rth23); // need compiler-generated __xtoHash changes
+    //assert(tih24 == rth24);
+    //assert(tih25 == rth25);
+    assert(tih26 == rth26);
+    assert(tih27 == rth27);
+    assert(tih28 == rth28);
+    assert(tih29 == rth29);
+    assert(tih30 == rth30);
+    assert(tih31 == rth31);
+    assert(tih32 == rth32);
+    assert(tih33 == rth33);
 }
 
 

src/object.d

@@ -1025,10 +1025,7 @@ class TypeInfo
 
     override size_t toHash() @trusted const nothrow
     {
-        import core.internal.traits : externDFunc;
-        alias hashOf = externDFunc!("rt.util.hash.hashOf",
-                                    size_t function(const(void)[], size_t) @trusted pure nothrow @nogc);
-        return hashOf(this.toString(), 0);
+        return hashOf(this.toString());
     }
 
     override int opCmp(Object o)
@@ -1064,7 +1061,10 @@ class TypeInfo
      * Bugs:
      *    fix https://issues.dlang.org/show_bug.cgi?id=12516 e.g. by changing this to a truly safe interface.
      */
-    size_t getHash(scope const void* p) @trusted nothrow const { return cast(size_t)p; }
+    size_t getHash(scope const void* p) @trusted nothrow const
+    {
+        return hashOf(p);
+    }
 
     /// Compares two instances for equality.
     bool equals(in void* p1, in void* p2) const { return p1 == p2; }
@@ -1191,12 +1191,7 @@ class TypeInfo_Pointer : TypeInfo
 
     override size_t getHash(scope const void* p) @trusted const
     {
-        // If the target of `p` is n-byte aligned then the
-        // bottom log2(n) bits of `p` will always be 0.
-        // Performing a constant magnitude xor-shift is
-        // inexpensive and will generally pay off.
-        size_t addr = cast(size_t) *cast(const void**) p;
-        return addr ^ (addr >>> 4);
+        return hashOf(*cast(void**)p);
     }
 
     override bool equals(in void* p1, in void* p2) const
@@ -1716,7 +1711,7 @@ class TypeInfo_Class : TypeInfo
     override size_t getHash(scope const void* p) @trusted const
     {
         auto o = *cast(Object*)p;
-        return o ? o.toHash() : 0;
+        return hashOf(o ? o.toHash() : 0);
     }
 
     override bool equals(in void* p1, in void* p2) const
@@ -1870,10 +1865,14 @@ class TypeInfo_Interface : TypeInfo
 
     override size_t getHash(scope const void* p) @trusted const
     {
+        if (!*cast(void**)p)
+        {
+            return hashOf(null);
+        }
         Interface* pi = **cast(Interface ***)*cast(void**)p;
         Object o = cast(Object)(*cast(void**)p - pi.offset);
         assert(o);
-        return o.toHash();
+        return hashOf(o.toHash());
     }
 
     override bool equals(in void* p1, in void* p2) const
@@ -1943,14 +1942,11 @@ class TypeInfo_Struct : TypeInfo
         assert(p);
         if (xtoHash)
         {
-            return (*xtoHash)(p);
+            return hashOf((*xtoHash)(p));
         }
         else
         {
-            import core.internal.traits : externDFunc;
-            alias hashOf = externDFunc!("rt.util.hash.hashOf",
-                                        size_t function(const(void)[], size_t) @trusted pure nothrow @nogc);
-            return hashOf(p[0 .. initializer().length], 0);
+            return hashOf(p[0 .. initializer().length]);
         }
     }
 
@@ -4546,14 +4542,12 @@ private size_t getArrayHash(in TypeInfo element, in void* ptr, in size_t count)
     }
 
     import core.internal.traits : externDFunc;
-    alias hashOf = externDFunc!("rt.util.hash.hashOf",
-                                size_t function(const(void)[], size_t) @trusted pure nothrow @nogc);
     if(!hasCustomToHash(element))
-        return hashOf(ptr[0 .. elementSize * count], 0);
+        return hashOf(ptr[0 .. elementSize * count]);
 
     size_t hash = 0;
     foreach(size_t i; 0 .. count)
-        hash = hash * 33 + element.getHash(ptr + i * elementSize);
+        hash = hashOf(element.getHash(ptr + i * elementSize), hash);
     return hash;
 }
 

src/rt/aaA.d

@@ -672,25 +672,28 @@ extern (C) int _aaEqual(in TypeInfo tiRaw, in AA aa1, in AA aa2)
 extern (C) hash_t _aaGetHash(in AA* aa, in TypeInfo tiRaw) nothrow
 {
     if (aa.empty)
-        return 0;
+        return hashOf(0);
 
     import rt.lifetime : unqualify;
 
     auto uti = unqualify(tiRaw);
     auto ti = *cast(TypeInfo_AssociativeArray*)&uti;
     immutable off = aa.valoff;
+    auto keyHash = &ti.key.getHash;
     auto valHash = &ti.value.getHash;
 
     size_t h;
+    import core.stdc.stdio;
     foreach (b; aa.buckets)
     {
         if (!b.filled)
             continue;
-        size_t[2] h2 = [b.hash, valHash(b.entry + off)];
+        size_t[2] h2 = [keyHash(b.entry), valHash(b.entry + off)];
         // use addition here, so that hash is independent of element order
         h += hashOf(h2);
     }
-    return h;
+
+    return hashOf(h);
 }
 
 /**