Address PR feedback

dotnet · Feb 7, 2023 · 21728ed · 21728ed
1 parent 5fc1900
commit 21728ed
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/...s/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs b/...s/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs
@@ -478,7 +478,7 @@ public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value)
             else
             {
                 Debug.Assert(comparer is not null);
-                int hashcode = _comparerIsDefaultForClasses ? key.GetHashCode() : comparer.GetHashCode(key);
+                int hashcode = GetHashCode(comparer, key);
                 for (Node? n = GetBucket(tables, hashcode); n is not null; n = n._next)
                 {
                     if (hashcode == n._hashcode && comparer.Equals(n._key, key))
@@ -1303,10 +1303,9 @@ public TValue AddOrUpdate<TArg>(
                     }
                 }
 
-                Tables newTables = _tables;
-                if (tables != newTables)
+                if (tables != _tables)
                 {
-                    tables = newTables;
+                    tables = _tables;
                     if (!ReferenceEquals(comparer, tables._comparer))
                     {
                         comparer = tables._comparer;
@@ -1377,10 +1376,9 @@ public TValue AddOrUpdate(TKey key, Func<TKey, TValue> addValueFactory, Func<TKe
                     }
                 }
 
-                Tables newTables = _tables;
-                if (tables != newTables)
+                if (tables != _tables)
                 {
-                    tables = newTables;
+                    tables = _tables;
                     if (!ReferenceEquals(comparer, tables._comparer))
                     {
                         comparer = tables._comparer;
@@ -1444,10 +1442,9 @@ public TValue AddOrUpdate(TKey key, TValue addValue, Func<TKey, TValue, TValue>
                     }
                 }
 
-                Tables newTables = _tables;
-                if (tables != newTables)
+                if (tables != _tables)
                 {
-                    tables = newTables;
+                    tables = _tables;
                     if (!ReferenceEquals(comparer, tables._comparer))
                     {
                         comparer = tables._comparer;