Drop range check

dotnet · Dec 15, 2017 · 2ea4ec2 · 2ea4ec2
1 parent 40fc408
commit 2ea4ec2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/mscorlib/shared/System/Collections/Generic/Dictionary.cs b/src/mscorlib/shared/System/Collections/Generic/Dictionary.cs
@@ -371,15 +371,18 @@ private int FindEntry(TKey key)
                 i = buckets[hashCode % buckets.Length];
 
                 Entry[] entries = _entries;
-                while (i >= 0)
+                do
                 {
                     if (entries[i].hashCode == hashCode && comparer.Equals(entries[i].key, key))
+                    // Should be a while loop https://github.com/dotnet/coreclr/issues/15476
+                    // Test in if to drop range check for following array access
+                    if ((uint)i >= (uint)entries.Length || (entries[i].hashCode == hashCode && comparer.Equals(entries[i].key, key)))
                     {
                         break;
                     }
 
                     i = entries[i].next;
-                }
+                } while (true);
             }
             return i;
         }