ContainsValue

dotnet · Oct 13, 2019 · 17d666c · 17d666c
1 parent 413931e
commit 17d666c
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs b/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs
@@ -237,21 +237,31 @@ public bool ContainsKey(TKey key)
         public bool ContainsValue(TValue value)
         {
             Entry[]? entries = _entries;
+            int count = _count;
+            bool result = false;
             if (value == null)
             {
-                for (int i = 0; i < _count; i++)
+                for (int i = 0; i < count; i++)
                 {
-                    if (entries![i].next >= -1 && entries[i].value == null) return true;
+                    if (entries![i].next >= -1 && entries[i].value == null)
+                    {
+                        result = true;
+                        break;
+                    }
                 }
             }
             else
             {
                 if (default(TValue)! != null) // TODO-NULLABLE: default(T) == null warning (https://github.com/dotnet/roslyn/issues/34757)
                 {
                     // ValueType: Devirtualize with EqualityComparer<TValue>.Default intrinsic
-                    for (int i = 0; i < _count; i++)
+                    for (int i = 0; i < count; i++)
                     {
-                        if (entries![i].next >= -1 && EqualityComparer<TValue>.Default.Equals(entries[i].value, value)) return true;
+                        if (entries![i].next >= -1 && EqualityComparer<TValue>.Default.Equals(entries[i].value, value))
+                        {
+                            result = true;
+                            break;
+                        }
                     }
                 }
                 else
@@ -260,13 +270,17 @@ public bool ContainsValue(TValue value)
                     // https://github.com/dotnet/coreclr/issues/17273
                     // So cache in a local rather than get EqualityComparer per loop iteration
                     EqualityComparer<TValue> defaultComparer = EqualityComparer<TValue>.Default;
-                    for (int i = 0; i < _count; i++)
+                    for (int i = 0; i < count; i++)
                     {
-                        if (entries![i].next >= -1 && defaultComparer.Equals(entries[i].value, value)) return true;
+                        if (entries![i].next >= -1 && defaultComparer.Equals(entries[i].value, value))
+                        {
+                            result = true;
+                            break;
+                        }
                     }
                 }
             }
-            return false;
+            return result;
         }
 
         private void CopyTo(KeyValuePair<TKey, TValue>[] array, int index)