fix x2

dlang · Oct 4, 2014 · 7c37851 · 7c37851
1 parent d236d1c
commit 7c37851
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/object.di b/src/object.di
@@ -384,7 +384,7 @@ extern (C)
     void* _aaRangeFrontValue(AARange r) pure nothrow @nogc;
     void _aaRangePopFront(ref AARange r) pure nothrow @nogc;
 
-    void* _d_assocarrayliteralTX(const TypeInfo_AssociativeArray ti, void[] keys, void[] values) @trusted pure;
+    void* _d_assocarrayliteralTX(const TypeInfo_AssociativeArray ti, void[] keys, void[] values) pure;
 }
 
 auto aaLiteral(Key, Value, T...)(auto ref T args) if (T.length % 2 == 0)
@@ -409,12 +409,13 @@ auto aaLiteral(Key, Value, T...)(auto ref T args) if (T.length % 2 == 0)
 
         void[] key_slice;
         void[] value_slice;
-
+        void *ret;
         () @trusted {
             key_slice = *cast(void[]*)&keys;
             value_slice = *cast(void[]*)&values;
+            ret = _d_assocarrayliteralTX(typeid(Value[Key]), key_slice, value_slice);
         }();
-        return _d_assocarrayliteralTX(typeid(Value[Key]), key_slice, value_slice);
+        return ret;
     }
 }
 

diff --git a/src/object_.d b/src/object_.d
@@ -1980,7 +1980,7 @@ extern (C)
     int _aaEqual(in TypeInfo tiRaw, in void* e1, in void* e2);
     hash_t _aaGetHash(in void* aa, in TypeInfo tiRaw) nothrow;
 
-    void* _d_assocarrayliteralTX(const TypeInfo_AssociativeArray ti, void[] keys, void[] values) @trusted pure;
+    void* _d_assocarrayliteralTX(const TypeInfo_AssociativeArray ti, void[] keys, void[] values) pure;
 }
 
 auto aaLiteral(Key, Value, T...)(auto ref T args) if (T.length % 2 == 0)
@@ -2005,12 +2005,13 @@ auto aaLiteral(Key, Value, T...)(auto ref T args) if (T.length % 2 == 0)
 
         void[] key_slice;
         void[] value_slice;
-
+        void *ret;
         () @trusted {
             key_slice = *cast(void[]*)&keys;
             value_slice = *cast(void[]*)&values;
+            ret = _d_assocarrayliteralTX(typeid(Value[Key]), key_slice, value_slice);
         }();
-        return _d_assocarrayliteralTX(typeid(Value[Key]), key_slice, value_slice);
+        return ret;
     }
 }