Imported Upstream version 6.12.0.102

Former-commit-id: e614926ae5b86d74c564629f26c1f12b72a78823
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-10-10 08:55:28 +00:00
parent d7ffa4a239
commit 0e6f307daf
53 changed files with 828 additions and 737 deletions

View File

@ -14,6 +14,7 @@
===========================================================*/
using System.Diagnostics;
using System.Threading;
using System.Runtime.CompilerServices;
namespace System.Collections.Generic
@ -68,6 +69,10 @@ namespace System.Collections.Generic
{
IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@ -85,6 +90,10 @@ namespace System.Collections.Generic
return InternalBinarySearch(array, index, length, value, comparer);
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@ -108,6 +117,10 @@ namespace System.Collections.Generic
{
IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@ -355,6 +368,10 @@ namespace System.Collections.Generic
{
IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@ -377,6 +394,10 @@ namespace System.Collections.Generic
return ArraySortHelper<T>.InternalBinarySearch(array, index, length, value, comparer);
}
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@ -645,6 +666,10 @@ namespace System.Collections.Generic
{
IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@ -893,6 +918,10 @@ namespace System.Collections.Generic
{
IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
}
catch (ThreadAbortException)
{
throw;
}
catch (Exception e)
{
throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);