only set this in TEnumerableBase.Create - all implementations ensure that inheriting interfaces use the same IMT field as IEnumerable<T> does

Author: sglienke

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

@@ -593,8 +593,6 @@   TListBase<T> = class abstract(TCollectionBase<T>)
   {$ENDREGION}
     function CreateList: IList<T>; virtual;
   public
-    constructor Create; override;
-
     function Add(const item: T): Boolean;
 
     function Remove(const item: T): Boolean;
@@ -836,7 +834,8 @@ function TEnumerableBase.GetIsEmpty: Boolean;
 constructor TEnumerableBase<T>.Create;
 begin
   inherited Create;
-  fComparer := IComparer<T>(_LookupVtableInfo(giComparer, GetElementType, SizeOf(T)));
+  if not Assigned(fComparer) then
+    fComparer := IComparer<T>(_LookupVtableInfo(giComparer, GetElementType, SizeOf(T)));
 end;
 
 constructor TEnumerableBase<T>.Create(const comparer: IComparer<T>);
@@ -1791,7 +1790,6 @@ function TSourceIterator<T>.GetElementType: PTypeInfo;
 constructor TCollectionBase<T>.Create;
 begin
   inherited Create;
-  Pointer(this) := Pointer(PByte(Self) + GetInterfaceEntry(ICollection<T>).IOffset);
   UpdateNotify(Self);
 end;
 
@@ -2515,8 +2513,6 @@ constructor TMapBase<TKey, T>.Create;
   inherited Create;
   fOnKeyChanged := TCollectionChangedEventImpl<TKey>.Create;
   fOnValueChanged := TCollectionChangedEventImpl<T>.Create;
-
-  Pointer(this) := Pointer(PByte(Self) + GetInterfaceEntry(IMap<TKey, T>).IOffset);
 end;
 
 destructor TMapBase<TKey, T>.Destroy;
@@ -2601,12 +2597,6 @@ procedure TMapBase<TKey, T>.ValueChanged(const item: T;
 
 {$REGION 'TListBase<T>'}
 
-constructor TListBase<T>.Create;
-begin
-  inherited Create;
-  Pointer(this) := Pointer(PByte(Self) + GetInterfaceEntry(IList<T>).IOffset);
-end;
-
 function TListBase<T>.CreateList: IList<T>;
 begin
   Result := TList<T>.Create;

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

@@ -1984,7 +1984,8 @@ constructor TFoldedList<T>.Create(elementType: PTypeInfo;
   const comparer: IComparer<T>; ownsObjects: Boolean);
 begin
   fElementType := elementType;
-  inherited Create(comparer);
+  fComparer := comparer;
+  inherited Create;
   SetOwnsObjects(ownsObjects);
 end;
 

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

@@ -149,8 +149,6 @@ constructor TAbstractStack<T>.Create;
 begin
   inherited Create;
   fOnChanged := TCollectionChangedEventImpl<T>.Create;
-
-  Pointer(this) := Pointer(PByte(Self) + GetInterfaceEntry(IStack<T>).IOffset);
 end;
 
 constructor TAbstractStack<T>.Create(const values: array of T);