Merge pull request #490 from 9rnsr/fix10106

Issue 10106 - [ICE] Ice in glue.c:1215 + 2 error messages without lines

Author: WalterBright

src/object.di

@@ -390,6 +390,16 @@ extern (C)
     void* _d_assocarrayliteralT(TypeInfo_AssociativeArray ti, size_t length, ...);
 }
 
+private template _Unqual(T)
+{
+         static if (is(T U == shared(const U))) alias U _Unqual;
+    else static if (is(T U ==        const U )) alias U _Unqual;
+    else static if (is(T U ==    immutable U )) alias U _Unqual;
+    else static if (is(T U ==        inout U )) alias U _Unqual;
+    else static if (is(T U ==       shared U )) alias U _Unqual;
+    else                                        alias T _Unqual;
+}
+
 struct AssociativeArray(Key, Value)
 {
 private:
@@ -399,8 +409,8 @@ private:
         Slot *next;
         size_t hash;
         Key key;
-        version(D_LP64) align(16) Value value; // c.f. rt/aaA.d, aligntsize()
-        else align(4) Value value;
+        version(D_LP64) align(16) _Unqual!Value value; // c.f. rt/aaA.d, aligntsize()
+        else align(4) _Unqual!Value value;
 
         // Stop creating built-in opAssign
         @disable void opAssign(Slot);
@@ -549,7 +559,7 @@ public:
 
             @property ref Value front()
             {
-                return state.front.value;
+                return *cast(Value*)&state.front.value;
             }
 
             alias state this;

src/object_.d

@@ -2070,6 +2070,16 @@ extern (C)
     hash_t _aaGetHash(void* aa, const(TypeInfo) tiRaw) nothrow;
 }
 
+private template _Unqual(T)
+{
+         static if (is(T U == shared(const U))) alias U _Unqual;
+    else static if (is(T U ==        const U )) alias U _Unqual;
+    else static if (is(T U ==    immutable U )) alias U _Unqual;
+    else static if (is(T U ==        inout U )) alias U _Unqual;
+    else static if (is(T U ==       shared U )) alias U _Unqual;
+    else                                        alias T _Unqual;
+}
+
 struct AssociativeArray(Key, Value)
 {
 private:
@@ -2079,8 +2089,8 @@ private:
         Slot *next;
         size_t hash;
         Key key;
-        version(D_LP64) align(16) Value value; // c.f. rt/aaA.d, aligntsize()
-        else align(4) Value value;
+        version(D_LP64) align(16) _Unqual!Value value; // c.f. rt/aaA.d, aligntsize()
+        else align(4) _Unqual!Value value;
 
         // Stop creating built-in opAssign
         @disable void opAssign(Slot);
@@ -2229,7 +2239,7 @@ public:
 
             @property ref Value front()
             {
-                return state.front.value;
+                return *cast(Value*)&state.front.value;
             }
 
             alias state this;