Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Fix bogus assert in ArraySortHelper #6018

Merged
merged 1 commit into from
Jun 26, 2018
Merged

Fix bogus assert in ArraySortHelper #6018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ public void Sort(TKey[] keys, TValue[] values, int index, int length, IComparer<
private static void SwapIfGreaterWithItems(TKey[] keys, TValue[] values, IComparer<TKey> comparer, int a, int b)
{
Debug.Assert(keys != null);
Debug.Assert(values != null && values.Length >= keys.Length);
Debug.Assert(values != null);
Debug.Assert(comparer != null);
Debug.Assert(0 <= a && a < keys.Length);
Debug.Assert(0 <= b && b < keys.Length);
Debug.Assert(0 <= a && a < keys.Length && a < values.Length);
Debug.Assert(0 <= b && b < keys.Length && b < values.Length);

if (a != b)
{
Expand Down
12 changes: 0 additions & 12 deletions tests/TopN.CoreFX.Windows.issues.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,18 +775,6 @@
"namespaces": null,
"classes": null,
"methods": [
{
"name": "System.Tests.TupleTests.CompareTo",
"reason": "https://github.com/dotnet/corert/issues/6015"
},
{
"name": "System.Tests.TupleTests.Equals_GetHashCode",
"reason": "https://github.com/dotnet/corert/issues/6015"
},
{
"name": "System.Tests.ArrayTests.Sort_Array_Array_NonGeneric",
"reason": "https://github.com/dotnet/corert/issues/6016"
},
{
"name": "System.Reflection.Tests.MethodInfoTests.TestEquality2",
"reason": "Xunit.Sdk.EqualException"
Expand Down