Merge pull request #877 from 9rnsr/fix13078

[REG2.066a] Issue 13078 - [dmd 2.066-b2] AA rehash failed with shared
dlang · Jul 11, 2014 · a13628a · a13628a
2 parents 930e0ac + f05177b
commit a13628a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/src/object.di b/src/object.di
@@ -375,13 +375,25 @@ extern (C)
 
 alias AssociativeArray(Key, Value) = Value[Key];
 
-Value[Key] rehash(T : Value[Key], Value, Key)(auto ref T aa)
+T rehash(T : Value[Key], Value, Key)(T aa)
 {
     _aaRehash(cast(void**)&aa, typeid(Value[Key]));
     return aa;
 }
 
-Value[Key] rehash(T : Value[Key], Value, Key)(T* aa)
+T rehash(T : Value[Key], Value, Key)(T* aa)
+{
+    _aaRehash(cast(void**)aa, typeid(Value[Key]));
+    return *aa;
+}
+
+T rehash(T : shared Value[Key], Value, Key)(T aa)
+{
+    _aaRehash(cast(void**)&aa, typeid(Value[Key]));
+    return aa;
+}
+
+T rehash(T : shared Value[Key], Value, Key)(T* aa)
 {
     _aaRehash(cast(void**)aa, typeid(Value[Key]));
     return *aa;

diff --git a/src/object_.d b/src/object_.d
@@ -1963,13 +1963,25 @@ extern (C)
 
 alias AssociativeArray(Key, Value) = Value[Key];
 
-Value[Key] rehash(T : Value[Key], Value, Key)(auto ref T aa)
+T rehash(T : Value[Key], Value, Key)(T aa)
 {
     _aaRehash(cast(void**)&aa, typeid(Value[Key]));
     return aa;
 }
 
-Value[Key] rehash(T : Value[Key], Value, Key)(T* aa)
+T rehash(T : Value[Key], Value, Key)(T* aa)
+{
+    _aaRehash(cast(void**)aa, typeid(Value[Key]));
+    return *aa;
+}
+
+T rehash(T : shared Value[Key], Value, Key)(T aa)
+{
+    _aaRehash(cast(void**)&aa, typeid(Value[Key]));
+    return aa;
+}
+
+T rehash(T : shared Value[Key], Value, Key)(T* aa)
 {
     _aaRehash(cast(void**)aa, typeid(Value[Key]));
     return *aa;
@@ -2263,6 +2275,13 @@ pure nothrow unittest
     aa[1] = 1;
 }
 
+pure nothrow unittest
+{
+    // bug 13078
+    shared string[][string] map;
+    map.rehash;
+}
+
 deprecated("Please use destroy instead of clear.")
 alias destroy clear;