From 5a9fe7540e047c554f37359e759c55a678a68bfc Mon Sep 17 00:00:00 2001
From: sakno <roman.sakno@gmail.com>
Date: Mon, 16 Oct 2023 11:34:45 +0300
Subject: [PATCH] Optimized version for reference types (#193)

---
 src/DotNext/Span.cs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/DotNext/Span.cs b/src/DotNext/Span.cs
index a9948711e..9b8d6369e 100644
--- a/src/DotNext/Span.cs
+++ b/src/DotNext/Span.cs
@@ -762,34 +762,35 @@ public static ReadOnlySpan<TBase> Contravariance<T, TBase>(this ReadOnlySpan<T>
     /// <param name="x">The first span.</param>
     /// <param name="y">The second span.</param>
     /// <exception cref="ArgumentOutOfRangeException">The length of <paramref name="y"/> is not of the same length as <paramref name="x"/>.</exception>
-    public static unsafe void Swap<T>(this Span<T> x, Span<T> y)
+    public static void Swap<T>(this Span<T> x, Span<T> y)
     {
         if (x.Length != y.Length)
             throw new ArgumentOutOfRangeException(nameof(y));
 
         var bufferSize = Math.Min(MemoryRental<T>.StackallocThreshold, x.Length);
-        MemoryRental<T> buffer;
         if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
         {
-            buffer = new(bufferSize);
+            T[] buffer = ArrayPool<T>.Shared.Rent(bufferSize);
+            Swap(x, y, buffer);
+            ArrayPool<T>.Shared.Return(buffer, clearArray: true);
         }
         else
         {
-            // Only T without references inside can be allocated on the stack.
-            // GC cannot track references placed on the stack using `localloc` IL instruction.
-            void* ptr = stackalloc byte[checked(Unsafe.SizeOf<T>() * bufferSize)];
-            buffer = new Span<T>(ptr, bufferSize);
+            unsafe
+            {
+                // Only T without references inside can be allocated on the stack.
+                // GC cannot track references placed on the stack using `localloc` IL instruction.
+                void* buffer = stackalloc byte[checked(Unsafe.SizeOf<T>() * bufferSize)];
+                Swap(x, y, new Span<T>(buffer, bufferSize));
+            }
         }
 
-        Swap(x, y, buffer.Span);
-        buffer.Dispose();
-
         static void Swap(Span<T> x, Span<T> y, Span<T> buffer)
         {
             Debug.Assert(x.Length == y.Length);
             Debug.Assert(buffer.IsEmpty is false);
 
-            while (x.Length > buffer.Length)
+            while (x.Length >= buffer.Length)
             {
                 SwapCore(TrimLengthCore(x, buffer.Length, out x), TrimLengthCore(y, buffer.Length, out y), buffer);
             }