Fix GC hole in Guid

Found in dotnet#99130.
MichalPetryka · Mar 1, 2024 · eaf046c · eaf046c
1 parent 24a9ec6
commit eaf046c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Guid.cs b/src/libraries/System.Private.CoreLib/src/System/Guid.cs
@@ -841,10 +841,6 @@ private static bool IsHexPrefix(ReadOnlySpan<char> str, int i) =>
             str[i] == '0' &&
             (str[i + 1] | 0x20) == 'x';
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static unsafe ReadOnlySpan<byte> AsBytes(in Guid source) =>
-            new ReadOnlySpan<byte>(Unsafe.AsPointer(ref Unsafe.AsRef(in source)), sizeof(Guid));
-
         // Returns an unsigned byte array containing the GUID.
         public byte[] ToByteArray()
         {
@@ -856,7 +852,7 @@ public byte[] ToByteArray()
             else
             {
                 // slower path for BigEndian
-                Guid guid = new Guid(AsBytes(this), false);
+                Guid guid = new Guid(MemoryMarshal.AsBytes(new ReadOnlySpan<Guid>(this)), false);
                 MemoryMarshal.TryWrite(g, in guid);
             }
             return g;
@@ -874,7 +870,7 @@ public byte[] ToByteArray(bool bigEndian)
             else
             {
                 // slower path for Reverse
-                Guid guid = new Guid(AsBytes(this), bigEndian);
+                Guid guid = new Guid(MemoryMarshal.AsBytes(new ReadOnlySpan<Guid>(this)), bigEndian);
                 MemoryMarshal.TryWrite(g, in guid);
             }
             return g;
@@ -893,7 +889,7 @@ public bool TryWriteBytes(Span<byte> destination)
             else
             {
                 // slower path for BigEndian
-                Guid guid = new Guid(AsBytes(this), false);
+                Guid guid = new Guid(MemoryMarshal.AsBytes(new ReadOnlySpan<Guid>(this)), false);
                 MemoryMarshal.TryWrite(destination, in guid);
             }
             return true;
@@ -915,7 +911,7 @@ public bool TryWriteBytes(Span<byte> destination, bool bigEndian, out int bytesW
             else
             {
                 // slower path for Reverse
-                Guid guid = new Guid(AsBytes(this), bigEndian);
+                Guid guid = new Guid(MemoryMarshal.AsBytes(new ReadOnlySpan<Guid>(this)), bigEndian);
                 MemoryMarshal.TryWrite(destination, in guid);
             }
             bytesWritten = 16;