make use of traits(getPointerBitmap)

avoid recursive Unqual

Author: rainers

src/gc/rtinfo.d

@@ -8,7 +8,7 @@
 
 module gc.rtinfo;
 
-// version = RTInfoPRINTF; // want some compile time debug output?
+//version = RTInfoPRINTF; // want some compile time debug output?
 enum bool RTInfoMark__Monitor = false; // is __monitor GC allocated?
 enum bool supportTypedef = false; // causes deprecation warning
 
@@ -17,28 +17,33 @@ enum bool supportTypedef = false; // causes deprecation warning
 // supposed to trigger @@@BUG1308@@@, see std.traits.Unqual)
 template Unqual(T)
 {
-         static if (is(T U ==          immutable U)) alias Unqual = Unqual!U;
-    else static if (is(T U == shared inout const U)) alias Unqual = Unqual!U;
-    else static if (is(T U == shared inout       U)) alias Unqual = Unqual!U;
-    else static if (is(T U == shared       const U)) alias Unqual = Unqual!U;
-    else static if (is(T U == shared             U)) alias Unqual = Unqual!U;
-    else static if (is(T U ==        inout const U)) alias Unqual = Unqual!U;
-    else static if (is(T U ==        inout       U)) alias Unqual = Unqual!U;
-    else static if (is(T U ==              const U)) alias Unqual = Unqual!U;
-    else static if (is(T U == enum))                 alias Unqual = Unqual!U;
+         static if (is(T U ==          immutable U)) alias Unqual = Unenum!U;
+    else static if (is(T U == shared inout const U)) alias Unqual = Unenum!U;
+    else static if (is(T U == shared inout       U)) alias Unqual = Unenum!U;
+    else static if (is(T U == shared       const U)) alias Unqual = Unenum!U;
+    else static if (is(T U == shared             U)) alias Unqual = Unenum!U;
+    else static if (is(T U ==        inout const U)) alias Unqual = Unenum!U;
+    else static if (is(T U ==        inout       U)) alias Unqual = Unenum!U;
+    else static if (is(T U ==              const U)) alias Unqual = Unenum!U;
+    else                                             alias Unqual = Unenum!T;
+}
+
+template Unenum(T)
+{
+    static if (is(T U == enum))                 alias Unenum = U;
     else
     {
         static if(supportTypedef)
         {
             static if (mixin("is(T U == typedef)"))
             {
-                alias Unqual = Unqual!U;
+                alias Unenum = Unenum!U;
             }
             else
-                alias Unqual = T;
+                alias Unenum = T;
         }
         else
-            alias Unqual = T;
+            alias Unenum = T;
     }
 }
 

src/object.di

@@ -12,11 +12,6 @@
  */
 module object;
 
-private import gc.rtinfo;
-
-enum void* rtinfoNoPointers  = null;
-enum void* rtinfoHasPointers = cast(void*)1;
-
 private
 {
     extern(C) void rt_finalize(void *ptr, bool det=true);
@@ -656,10 +651,29 @@ bool _xopCmp(in void* ptr, in void* ptr);
 void __ctfeWrite(T...)(auto ref T) {}
 void __ctfeWriteln(T...)(auto ref T values) { __ctfeWrite(values, "\n"); }
 
-template RTInfo(T)
+///////////////////////////////////////
+private enum hasTraitPointerBitmap = __traits(compiles, __traits(getPointerBitmap, int));
+
+enum void* rtinfoNoPointers  = null;
+enum void* rtinfoHasPointers = cast(void*)1;
+
+static if (hasTraitPointerBitmap)
 {
-    enum RTInfo = gc.rtinfo.RTInfoImpl!T;
+    template RTInfo(T)
+    {
+        enum RTInfo = __traits(getPointerBitmap,T).ptr;
+    }
+}
+else
+{
+    import gc.rtinfo;
+
+    template RTInfo(T)
+    {
+        enum RTInfo = gc.rtinfo.RTInfoImpl!T;
+    }
 }
+///////////////////////////////////////
 
 /// Provide the .dup array property.
 @property auto dup(T)(T[] a)

src/object_.d

@@ -35,15 +35,6 @@ private
     extern (C) void rt_finalize(void *data, bool det=true);
 }
 
-import gc.rtinfo;
-
-/**
-* shortcuts for the precise GC, also generated by the compiler
-* used instead of the actual pointer bitmap
-*/
-enum void* rtinfoNoPointers  = null;
-enum void* rtinfoHasPointers = cast(void*)1;
-
 // NOTE: For some reason, this declaration method doesn't work
 //       in this particular file (and this file only).  It must
 //       be a DMD thing.
@@ -2795,11 +2786,31 @@ bool _xopCmp(in void*, in void*)
  * Create RTInfo for type T
  */
 
-template RTInfo(T)
+private enum hasTraitPointerBitmap = __traits(compiles, __traits(getPointerBitmap, int));
+
+/**
+* shortcuts for the precise GC, also generated by the compiler
+* used instead of the actual pointer bitmap
+*/
+enum void* rtinfoNoPointers  = null;
+enum void* rtinfoHasPointers = cast(void*)1;
+
+static if (hasTraitPointerBitmap)
 {
-    enum RTInfo = gc.rtinfo.RTInfoImpl!T;
+    template RTInfo(T)
+    {
+        enum RTInfo = __traits(getPointerBitmap,T).ptr;
+    }
 }
+else
+{
+    import gc.rtinfo;
 
+    template RTInfo(T)
+    {
+        enum RTInfo = gc.rtinfo.RTInfoImpl!T;
+    }
+}
 
 // Helper functions