core/internal/array/utils.d: TraceHook support types with quotes in name (#21510)

Avoid directly mixin'ing the result of T.stringof for arbitrary types
since that proves problematic with string parameters to templates
with their quote and other special characters.

Signed-off-by: Andrei Horodniceanu <[email protected]>

Author: the-horo

compiler/test/compilable/profilegc_typename.d

@@ -0,0 +1,10 @@
+// REQUIRED_ARGS: -profile=gc
+struct T(string s) {}
+alias TypeWithQuotes = T!q"EOS
+`"'}])>
+EOS";
+
+void foo() {
+    TypeWithQuotes[] arr;
+    arr ~= TypeWithQuotes();
+}

druntime/src/core/internal/array/appending.d

@@ -57,7 +57,7 @@ version (D_ProfileGC)
         version (D_TypeInfo)
         {
             import core.internal.array.utils: TraceHook, gcStatsPure, accumulatePure;
-            mixin(TraceHook!(Tarr.stringof, "_d_arrayappendcTX"));
+            mixin(TraceHook!("Tarr", "_d_arrayappendcTX"));
 
             return _d_arrayappendcTX(px, n);
         }
@@ -120,7 +120,7 @@ version (D_ProfileGC)
         version (D_TypeInfo)
         {
             import core.internal.array.utils: TraceHook, gcStatsPure, accumulatePure;
-            mixin(TraceHook!(Tarr.stringof, "_d_arrayappendT"));
+            mixin(TraceHook!("Tarr", "_d_arrayappendT"));
 
             return _d_arrayappendT(x, y);
         }

druntime/src/core/internal/array/concatenation.d

@@ -174,7 +174,7 @@ version (D_ProfileGC)
         version (D_TypeInfo)
         {
             import core.internal.array.utils: TraceHook, gcStatsPure, accumulatePure;
-            mixin(TraceHook!(Tarr.stringof, "_d_arraycatnTX"));
+            mixin(TraceHook!("Tarr", "_d_arraycatnTX"));
 
             import core.lifetime: forward;
             return _d_arraycatnTX!Tret(forward!froms);

druntime/src/core/internal/array/construction.d

@@ -475,7 +475,7 @@ version (D_ProfileGC)
         version (D_TypeInfo)
         {
             import core.internal.array.utils : TraceHook, gcStatsPure, accumulatePure;
-            mixin(TraceHook!(T.stringof, "_d_newarrayT"));
+            mixin(TraceHook!("T", "_d_newarrayT"));
 
             return _d_newarrayT!T(length, isShared);
         }
@@ -607,7 +607,7 @@ version (D_ProfileGC)
         version (D_TypeInfo)
         {
             import core.internal.array.utils : TraceHook, gcStatsPure, accumulatePure;
-            mixin(TraceHook!(T.stringof, "_d_newarraymTX"));
+            mixin(TraceHook!("T", "_d_newarraymTX"));
 
             return _d_newarraymTX!(Tarr, T)(dims, isShared);
         }

druntime/src/core/internal/array/utils.d

@@ -41,16 +41,16 @@ version (D_ProfileGC)
     /**
      * TraceGC wrapper generator around the runtime hook `Hook`.
      * Params:
-     *   Type = The type of hook to report to accumulate
+     *   TypeIdent = The symbol of the type of hook to report to accumulate
      *   Hook = The name hook to wrap
      */
-    template TraceHook(string Type, string Hook)
+    template TraceHook(string TypeIdent, string Hook)
     {
         const char[] TraceHook = q{
             import core.internal.array.utils : gcStatsPure, accumulatePure;
 
             pragma(inline, false);
-            string name = } ~ "`" ~ Type ~ "`;" ~ q{
+            string name = } ~ TypeIdent ~ q{.stringof;
 
             // FIXME: use rt.tracegc.accumulator when it is accessable in the future.
             ulong currentlyAllocated = gcStatsPure().allocatedInCurrentThread;
@@ -91,7 +91,7 @@ version (D_ProfileGC)
     {
         version (D_TypeInfo)
         {
-            mixin(TraceHook!(T.stringof, __traits(identifier, Hook)));
+            mixin(TraceHook!("T", __traits(identifier, Hook)));
             return Hook(parameters);
         }
         else

druntime/src/core/lifetime.d

@@ -2793,7 +2793,7 @@ T _d_newclassTTrace(T)(string file = __FILE__, int line = __LINE__, string funcn
     version (D_TypeInfo)
     {
         import core.internal.array.utils : TraceHook, gcStatsPure, accumulatePure;
-        mixin(TraceHook!(T.stringof, "_d_newclassT"));
+        mixin(TraceHook!("T", "_d_newclassT"));
 
         return _d_newclassT!T();
     }
@@ -2999,7 +2999,7 @@ version (D_ProfileGC)
             }
 
             import core.internal.array.utils : TraceHook, gcStatsPure, accumulatePure;
-            mixin(TraceHook!(T.stringof, "_d_newitemT"));
+            mixin(TraceHook!("T", "_d_newitemT"));
 
             return _d_newitemT!T();
         }