Allocate RuntimeType objects on Frozen Object Heap

src/coreclr/jit/ee_il_dll.cpp

@@ -1617,9 +1617,30 @@ const char16_t* Compiler::eeGetShortClassName(CORINFO_CLASS_HANDLE clsHnd)
 
 void Compiler::eePrintFrozenObjectDescription(const char* prefix, size_t handle)
 {
-    const int maxStrSize      = 128;
+    const int maxStrSize = 64;
     char16_t  str[maxStrSize];
-    int       realLength      = this->info.compCompHnd->objectToString((void*)handle, str, maxStrSize);
+    int       realLength = this->info.compCompHnd->objectToString((void*)handle, str, maxStrSize);
+    if (realLength >= maxStrSize)
+    {
+        str[maxStrSize - 4] = L'.';
+        str[maxStrSize - 3] = L'.';
+        str[maxStrSize - 2] = L'.';
+        str[maxStrSize - 1] = 0;
+    }
+    else
+    {
+        str[realLength] = 0;
+    }
+
+    for (size_t i = 0; i < min(maxStrSize, realLength); i++)
+    {
+        // Escape \n and \r symbols
+        if (str[i] == L'\n' || str[i] == L'\r')
+        {
+            str[i] = L' ';
+        }
+    }
+
     if (realLength >= 0)
     {
         printf("%s '%S'\n", prefix, str);

src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

@@ -1831,19 +1831,19 @@ private int getStringLiteral(CORINFO_MODULE_STRUCT_* module, uint metaTOK, char*
         }
 
 #pragma warning disable CA1822 // Mark members as static
-        private int objectToString(void* handle, char* buffer, int size)
+        private int objectToString(void* handle, char* buffer, int bufferSize)
 #pragma warning restore CA1822 // Mark members as static
         {
-            Debug.Assert(size > 0 && handle != null && buffer != null);
+            Debug.Assert(bufferSize >= 0 && handle != null);
 
             // NOTE: this function is used for pinned/frozen handles
 
             ReadOnlySpan<char> str = HandleToObject((IntPtr)handle).ToString();
-            int maxLength = Math.Min(size, str.Length);
-            str.CopyTo(new Span<char>(buffer, maxLength));
-            // Null-terminate it (trim if needed)
-            buffer[maxLength == size ? maxLength - 1 : maxLength] = '\0';
-            return maxLength;
+            if (buffer != null)
+            {
+                str.CopyTo(new Span<char>(buffer, Math.Min(bufferSize, str.Length)));
+            }
+            return str.Length;
         }
 
         private CorInfoType asCorInfoType(CORINFO_CLASS_STRUCT_* cls)

src/coreclr/vm/jitinterface.cpp

@@ -726,9 +726,9 @@ int CEEInfo::objectToString (
         MODE_PREEMPTIVE;
     } CONTRACTL_END;
 
-    int result = -1;
+    int charsCount = 0;
 
-    _ASSERT(handle != nullptr && buffer != nullptr && bufferSize > 0);
+    _ASSERT(handle != nullptr && bufferSize >= 0);
 
     JIT_TO_EE_TRANSITION();
 
@@ -748,17 +748,16 @@ int CEEInfo::objectToString (
         ((ReflectClassBaseObject*)obj)->GetType().GetName(stackStr);
     }
 
-    if (stackStr.GetCount() > 0)
+    charsCount = (int)stackStr.GetCount();
+
+    if (buffer != nullptr)
     {
-        result = min(bufferSize, (int)stackStr.GetCount());
-        memcpy((BYTE*)buffer, stackStr.GetUnicode(), result * 2);
-        // Null-terminate it (trim if needed)
-        buffer[result == bufferSize ? result - 1 : result] = 0;
+        memcpy((BYTE*)buffer, stackStr.GetUnicode(), min(bufferSize, charsCount) * 2);
     }
 
     EE_TO_JIT_TRANSITION();
 
-    return result;
+    return charsCount;
 }
 
 /* static */