avoid unnecessary reference counting for default comparers

Author: sglienke

Source/Base/Collections/Spring.Collections.Base.pas

@@ -1087,10 +1087,10 @@ function TEnumerableBase<T>.Concat(const second: IEnumerable<T>): IEnumerable<T>
 
 function TEnumerableBase<T>.Contains(const value: T): Boolean;
 var
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
 begin
-  comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T)));
-  Result := IEnumerable<T>(this).Contains(value, comparer);
+  comparer := _LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T));
+  Result := IEnumerable<T>(this).Contains(value, IEqualityComparer<T>(comparer));
 end;
 
 function TEnumerableBase<T>.Contains(const value: T;
@@ -1165,15 +1165,15 @@ function TEnumerableBase<T>.EqualsTo(const values: array of T): Boolean;
   ExitFalse;
 var
   enumerator: IEnumerator<T>;
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
   i: Integer;
   {$IFDEF RSP31615}
   item: T;
   {$ENDIF}
 begin
   i := 0;
   enumerator := IEnumerable<T>(this).GetEnumerator;
-  comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T)));
+  comparer := _LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T));
   while enumerator.MoveNext do
   begin
     {$IFDEF RSP31615}
@@ -1187,7 +1187,7 @@ function TEnumerableBase<T>.EqualsTo(const values: array of T): Boolean;
     end
     else
     {$ENDIF}
-    if (i > High(values)) or not comparer.Equals(enumerator.Current, values[i]) then
+    if (i > High(values)) or not IEqualityComparer<T>(comparer).Equals(enumerator.Current, values[i]) then
       goto ExitFalse;
     Inc(i);
   end;
@@ -1198,13 +1198,13 @@ function TEnumerableBase<T>.EqualsTo(const values: array of T): Boolean;
 
 function TEnumerableBase<T>.EqualsTo(const values: IEnumerable<T>): Boolean;
 var
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
 begin
   Result := IInterface(this) = values;
   if not Result then
   begin
-    comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T)));
-    Result := IEnumerable<T>(this).EqualsTo(values, comparer);
+    comparer := _LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T));
+    Result := IEnumerable<T>(this).EqualsTo(values, IEqualityComparer<T>(comparer));
   end;
 end;
 
@@ -3844,14 +3844,14 @@ function TArrayIterator<T>.IndexOf(const item: T; index: Integer): Integer;
 
 function TArrayIterator<T>.IndexOf(const item: T; index, count: Integer): Integer;
 var
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
   i: Integer;
 begin
   CheckRange(index, count, fCount);
 
-  comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T)));
+  comparer := _LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T));
   for i := index to index + count - 1 do
-    if comparer.Equals(fItems[i], item) then
+    if IEqualityComparer<T>(comparer).Equals(fItems[i], item) then
       Exit(i);
   Result := -1;
 end;

Source/Base/Collections/Spring.Collections.LinkedLists.pas

@@ -271,14 +271,14 @@ function TLinkedList<T>.Extract(const item: T): T;
 function TLinkedList<T>.Find(const value: T): TLinkedListNode<T>;
 var
   node: TLinkedListNode<T>;
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
 begin
   Result := nil;
   node := fHead;
   if Assigned(node) then
   begin
-    comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));
-    while not comparer.Equals(node.fItem, value) do
+    comparer := _LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T));
+    while not IEqualityComparer<T>(comparer).Equals(node.fItem, value) do
     begin
       node := node.fNext;
       if node = fHead then
@@ -291,16 +291,16 @@ function TLinkedList<T>.Find(const value: T): TLinkedListNode<T>;
 function TLinkedList<T>.FindLast(const value: T): TLinkedListNode<T>;
 var
   node1, node2: TLinkedListNode<T>;
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
 begin
   if not Assigned(fHead) then
     Exit(nil);
   node1 := fHead.fPrev;
   node2 := node1;
   if Assigned(node2) then
   begin
-    comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));
-    while not comparer.Equals(node2.fItem, value) do
+    comparer := _LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T));
+    while not IEqualityComparer<T>(comparer).Equals(node2.fItem, value) do
     begin
       node2 := node2.fPrev;
       if node2 = node1 then

Source/Base/Collections/Spring.Collections.Lists.pas

@@ -2270,12 +2270,12 @@ function TAnonymousReadOnlyList<T>.IndexOf(const item: T;
 function TAnonymousReadOnlyList<T>.IndexOf(const item: T; index,
   count: Integer): Integer;
 var
-  comparer: IEqualityComparer<T>;
+  comparer: Pointer;
   i: Integer;
 begin
-  comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));
+  comparer := _LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T));
   for i := index to index + count - 1 do
-    if Comparer.Equals(fItems(i), item) then
+    if IEqualityComparer<T>(comparer).Equals(fItems(i), item) then
       Exit(i);
   Result := -1;
 end;