Revert behaviour change version moves

dotnet · Mar 25, 2018 · 3971a59 · 3971a59
1 parent c5bb5ba
commit 3971a59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/mscorlib/shared/System/Collections/Generic/Dictionary.cs b/src/mscorlib/shared/System/Collections/Generic/Dictionary.cs
@@ -672,7 +672,6 @@ public bool Remove(TKey key)
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.key);
             }
 
-            _version++;
             if (_buckets != null)
             {
                 int hashCode = (_comparer?.GetHashCode(key) ?? key.GetHashCode()) & 0x7FFFFFFF;
@@ -708,6 +707,7 @@ public bool Remove(TKey key)
                         }
                         _freeList = i;
                         _freeCount++;
+                        _version++;
                         return true;
                     }
 
@@ -728,7 +728,6 @@ public bool Remove(TKey key, out TValue value)
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.key);
             }
 
-            _version++;
             if (_buckets != null)
             {
                 int hashCode = (_comparer?.GetHashCode(key) ?? key.GetHashCode()) & 0x7FFFFFFF;
@@ -767,6 +766,7 @@ public bool Remove(TKey key, out TValue value)
                         }
                         _freeList = i;
                         _freeCount++;
+                        _version++;
                         return true;
                     }
 

diff --git a/src/mscorlib/shared/System/Collections/Generic/List.cs b/src/mscorlib/shared/System/Collections/Generic/List.cs
@@ -676,7 +676,6 @@ public int IndexOf(T item, int index, int count)
         // 
         public void Insert(int index, T item)
         {
-            _version++;
             // Note that insertions at the end are legal.
             if ((uint)index > (uint)_size)
             {
@@ -689,6 +688,7 @@ public void Insert(int index, T item)
             }
             _items[index] = item;
             _size++;
+            _version++;
         }
 
         void IList.Insert(int index, object item)
@@ -868,7 +868,6 @@ void IList.Remove(object item)
         // The complexity is O(n).
         public int RemoveAll(Predicate<T> match)
         {
-            _version++;
             if (match == null)
             {
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.match);
@@ -900,6 +899,7 @@ public int RemoveAll(Predicate<T> match)
 
             int result = _size - freeIndex;
             _size = freeIndex;
+            _version++;
             return result;
         }
 
@@ -947,12 +947,13 @@ public void RemoveRange(int index, int count)
                 {
                     Array.Copy(_items, index + count, _items, index, _size - index);
                 }
+
+                _version++;
                 if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
                 {
                     Array.Clear(_items, _size, count);
                 }
             }
-            _version++;
         }
 
         // Reverses the elements in this list.
@@ -1091,10 +1092,10 @@ public bool TrueForAll(Predicate<T> match)
 
         private void AddEnumerable(IEnumerable<T> enumerable)
         {
-            _version++; // Even if the enumerable has no items, we can update _version.
             Debug.Assert(enumerable != null);
             Debug.Assert(!(enumerable is ICollection<T>), "We should have optimized for this beforehand.");
 
+            _version++; // Even if the enumerable has no items, we can update _version.
             using (IEnumerator<T> en = enumerable.GetEnumerator())
             {