removed equals inlining from TEnumerableBase

Author: sglienke

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

@@ -59,7 +59,6 @@   TEnumerableBase<T> = class abstract(TEnumerableBase)
     function GetComparer: IComparer<T>;
     function GetElementType: PTypeInfo; virtual;
   {$ENDREGION}
-    function Equals(const left, right: T): Boolean; reintroduce; inline;
     function QueryInterface(const IID: TGUID; out obj): HResult; stdcall;
     procedure CopyTo(var values: TArray<T>; index: Integer);
     function TryGetElementAt(var value: T; index: Integer): Boolean;
@@ -69,7 +68,6 @@   TEnumerableBase<T> = class abstract(TEnumerableBase)
     function TryGetLast(var value: T; const predicate: Predicate<T>): Boolean; overload;
     function TryGetSingle(var value: T): Boolean; overload;
     function TryGetSingle(var value: T; const predicate: Predicate<T>): Boolean; overload;
-    function UseComparer(typeKind: TTypeKind): Boolean; inline;
     property Comparer: IComparer<T> read fComparer;
   public
     constructor Create;
@@ -835,16 +833,6 @@ constructor TEnumerableBase<T>.Create;
     fComparer := IComparer<T>(_LookupVtableInfo(giComparer, GetElementType, SizeOf(T)));
 end;
 
-function TEnumerableBase<T>.UseComparer(typeKind: TTypeKind): Boolean;
-const
-  FastComparableTypes = [tkUnknown, tkInteger, tkChar, tkEnumeration, tkSet,
-                         tkClass, tkMethod, tkWChar, tkInterface, tkInt64,
-                         tkUString, tkClassRef, tkPointer, tkProcedure];
-begin
-  Result := not ((typeKind in FastComparableTypes) and (SizeOf(T) in [1, 2, 4, 8])
-    and ((fComparer = nil) or (Pointer(fComparer) = _LookupVtableInfo(giComparer, TypeInfo(T), SizeOf(T)))));
-end;
-
 function TEnumerableBase<T>.Aggregate(const func: Func<T, T, T>): T;
 var
   enumerator: IEnumerator<T>;
@@ -975,40 +963,19 @@ function TEnumerableBase<T>.ElementAtOrDefault(index: Integer;
     Result := defaultValue;
 end;
 
-function TEnumerableBase<T>.Equals(const left, right: T): Boolean;
-begin
-  if TType.Kind<T> = tkClass then
-    if PObject(@left)^ = nil then
-      Result := PObject(@right)^ = nil
-    else
-      Result := PObject(@left).Equals(PObject(@right)^)
-  else
-    if UseComparer(TType.Kind<T>) then
-      Result := fComparer.Compare(left, right) = 0
-    else
-      if TType.Kind<T> = tkUString then
-        Result := PString(@left)^ = PString(@right)^
-      else
-        case SizeOf(T) of
-          1: Result := PByte(@left)^ = PByte(@right)^;
-          2: Result := PWord(@left)^ = PWord(@right)^;
-          4: Result := PCardinal(@left)^ = PCardinal(@right)^;
-          8: Result := PUInt64(@left)^ = PUInt64(@right)^;
-        end;
-end;
-
 function TEnumerableBase<T>.EqualsTo(const values: array of T): Boolean;
 var
-  e: IEnumerator<T>;
+  enumerator: IEnumerator<T>;
+  comparer: IEqualityComparer<T>;
   i: Integer;
 begin
-  e := IEnumerable<T>(this).GetEnumerator;
   i := 0;
-
-  while e.MoveNext do
+  enumerator := IEnumerable<T>(this).GetEnumerator;
+  comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, GetElementType, SizeOf(T)));
+  while enumerator.MoveNext and (i < Length(values)) do
   begin
-    if not ((i < Length(values)) and Equals(e.Current, values[i])) then
-      Exit(False);
+    if not comparer.Equals(enumerator.Current, values[i]) then
+      Break;
     Inc(i);
   end;
   Result := i = Length(values);

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

@@ -295,12 +295,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>;
 begin
   Result := nil;
   node := fHead;
   if Assigned(node) then
   begin
-    while not Equals(node.fItem, value) do
+    comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));
+    while not comparer.Equals(node.fItem, value) do
     begin
       node := node.fNext;
       if node = fHead then
@@ -313,14 +315,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>;
 begin
   if not Assigned(fHead) then
     Exit(nil);
   node1 := fHead.fPrev;
   node2 := node1;
   if Assigned(node2) then
   begin
-    while not Equals(node2.fItem, value) do
+    comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));
+    while not comparer.Equals(node2.fItem, value) do
     begin
       node2 := node2.fPrev;
       if node2 = node1 then

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

@@ -32,6 +32,7 @@ interface
   Classes,
   Generics.Defaults,
   SysUtils,
+  TypInfo,
   Spring,
   Spring.Collections,
   Spring.Collections.Base;
@@ -73,6 +74,7 @@       TEnumerator = class(TRefCountedObject, IEnumerator<T>)
     fCapacity: Integer;
     fCount: Integer;
     fVersion: Integer;
+    function CanFastCompare: Boolean; inline;
     procedure Grow; overload;
     {$IFNDEF DELPHIXE8_UP}{$HINTS OFF}{$ENDIF}
     procedure Grow(capacity: Integer); overload;
@@ -365,13 +367,17 @@   TObservableInterfaceList = class(TFoldedList<IInterface>, INotifyPropertyChang
     property OnPropertyChanged: IEvent<TPropertyChangedEvent> read GetOnPropertyChanged;
   end;
 
+const
+  FastComparableTypes = [tkUnknown, tkInteger, tkChar, tkEnumeration, tkSet,
+                         tkClass, tkMethod, tkWChar, tkInterface, tkInt64,
+                         tkUString, tkClassRef, tkPointer, tkProcedure];
+
 implementation
 
 uses
 {$IFDEF DELPHIXE4}
   Rtti, // suppress hint about inlining
 {$ENDIF}
-  TypInfo,
   Spring.Collections.Extensions,
   Spring.Events,
   Spring.Events.Base,
@@ -392,6 +398,12 @@ destructor TAbstractArrayList<T>.Destroy;
   inherited Destroy;
 end;
 
+function TAbstractArrayList<T>.CanFastCompare: Boolean;
+begin
+  Result := (TType.Kind<T> in FastComparableTypes) and (SizeOf(T) in [1, 2, 4, 8])
+    and ((fComparer = nil) or (Pointer(fComparer) = _LookupVtableInfo(giComparer, TypeInfo(T), SizeOf(T))));
+end;
+
 function TAbstractArrayList<T>.GetCapacity: Integer;
 begin
   Result := fCapacity;
@@ -502,14 +514,8 @@ function TAbstractArrayList<T>.IndexOf(const item: T; index, count: Integer): In
 
   if TType.Kind<T> = tkClass then
     Result := TArrayHelper.IndexOfObj(fItems, item, index, count)
-  else if UseComparer(TType.Kind<T>) then
+  else if CanFastCompare then
   begin
-    for Result := index to index + count - 1 do
-      if Comparer.Compare(fItems[Result], item) = 0 then
-        Exit;
-    Result := -1;
-  end
-  else
     if TType.Kind<T> = tkUString then
       Result := TArrayHelper.IndexOfStr(fItems, item, index, count)
     else
@@ -519,6 +525,14 @@ function TAbstractArrayList<T>.IndexOf(const item: T; index, count: Integer): In
         4: Result := TArrayHelper.IndexOf4(fItems, item, index, count);
         8: Result := TArrayHelper.IndexOf8(fItems, item, index, count);
       end;
+  end
+  else
+  begin
+    for Result := index to index + count - 1 do
+      if Comparer.Compare(fItems[Result], item) = 0 then
+        Exit;
+    Result := -1;
+  end;
 end;
 
 procedure TAbstractArrayList<T>.SetItem(index: Integer; const value: T);
@@ -765,14 +779,8 @@ function TAbstractArrayList<T>.LastIndexOf(const item: T; index, count: Integer)
 
   if TType.Kind<T> = tkClass then
     Result := TArrayHelper.LastIndexOfStr(fItems, item, index, count)
-  else if UseComparer(TType.Kind<T>) then
+  else if CanFastCompare then
   begin
-    for Result := index downto index - count do
-      if Comparer.Compare(fItems[Result], item) = 0 then
-        Exit;
-    Result := -1;
-  end
-  else
     if TType.Kind<T> = tkUString then
       Result := TArrayHelper.LastIndexOfStr(fItems, item, index, count)
     else
@@ -782,6 +790,14 @@ function TAbstractArrayList<T>.LastIndexOf(const item: T; index, count: Integer)
         4: Result := TArrayHelper.LastIndexOf4(fItems, item, index, count);
         8: Result := TArrayHelper.LastIndexOf8(fItems, item, index, count);
       end;
+  end
+  else
+  begin
+    for Result := index downto index - count do
+      if Comparer.Compare(fItems[Result], item) = 0 then
+        Exit;
+    Result := -1;
+  end;
 end;
 
 procedure TAbstractArrayList<T>.DeleteInternal(index: Integer;
@@ -1948,10 +1964,12 @@ function TAnonymousReadOnlyList<T>.IndexOf(const item: T;
 function TAnonymousReadOnlyList<T>.IndexOf(const item: T; index,
   count: Integer): Integer;
 var
+  comparer: IEqualityComparer<T>;
   i: Integer;
 begin
+  comparer := IEqualityComparer<T>(_LookupVtableInfo(giEqualityComparer, TypeInfo(T), SizeOf(T)));
   for i := index to index + count - 1 do
-    if Equals(fItems(i), item) then
+    if Comparer.Equals(fItems(i), item) then
       Exit(i);
   Result := -1;
 end;