From 36cbba6b95219f532ca20df18570cf60f4bbe176 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 20 Oct 2020 10:51:38 +0200
Subject: [PATCH 1/2] Use ThrowHelper inside ValueType types

---
 .../src/System/ThrowHelper.cs                 |  6 ++++
 .../src/System/ValueTuple.cs                  | 36 +++++++++----------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/libraries/System.Private.CoreLib/src/System/ThrowHelper.cs b/src/libraries/System.Private.CoreLib/src/System/ThrowHelper.cs
index b88eaa4d93738c..52f52d5ee7055d 100644
--- a/src/libraries/System.Private.CoreLib/src/System/ThrowHelper.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/ThrowHelper.cs
@@ -88,6 +88,12 @@ internal static void ThrowArgumentException_CannotExtractScalar(ExceptionArgumen
             throw GetArgumentException(ExceptionResource.Argument_CannotExtractScalar, argument);
         }
 
+        [DoesNotReturn]
+        internal static void ThrowArgumentException_TupleIncorrectType(object obj)
+        {
+            throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, obj.GetType()), "other");
+        }
+
         [DoesNotReturn]
         internal static void ThrowArgumentOutOfRange_IndexException()
         {
diff --git a/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs b/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs
index f814bbb7a2c37e..bc8de601d3cd4b 100644
--- a/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs
@@ -62,7 +62,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return 0;
@@ -87,7 +87,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return 0;
@@ -324,7 +324,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1>)other;
@@ -351,7 +351,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1>)other;
@@ -518,7 +518,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2>)other);
@@ -546,7 +546,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2>)other;
@@ -710,7 +710,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3>)other);
@@ -741,7 +741,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3>)other;
@@ -918,7 +918,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4>)other);
@@ -952,7 +952,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4>)other;
@@ -1144,7 +1144,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5>)other);
@@ -1181,7 +1181,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5>)other;
@@ -1388,7 +1388,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5, T6>)other);
@@ -1428,7 +1428,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5, T6>)other;
@@ -1650,7 +1650,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5, T6, T7>)other);
@@ -1693,7 +1693,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5, T6, T7>)other;
@@ -1936,7 +1936,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>)other);
@@ -1982,7 +1982,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>))
             {
-                throw new ArgumentException(SR.Format(SR.ArgumentException_ValueTupleIncorrectType, GetType()), nameof(other));
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>)other;

From a07e4e14c9559dce10ea3b90aaea94793929937d Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 20 Oct 2020 18:32:32 +0200
Subject: [PATCH 2/2] Fix formatting

---
 .../src/System/ValueTuple.cs                  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs b/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs
index bc8de601d3cd4b..ad92422b6c8043 100644
--- a/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/ValueTuple.cs
@@ -62,7 +62,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return 0;
@@ -87,7 +87,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return 0;
@@ -324,7 +324,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1>)other;
@@ -351,7 +351,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1>)other;
@@ -518,7 +518,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2>)other);
@@ -546,7 +546,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2>)other;
@@ -710,7 +710,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3>)other);
@@ -741,7 +741,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3>)other;
@@ -918,7 +918,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4>)other);
@@ -952,7 +952,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4>)other;
@@ -1144,7 +1144,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5>)other);
@@ -1181,7 +1181,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5>)other;
@@ -1388,7 +1388,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5, T6>)other);
@@ -1428,7 +1428,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5, T6>)other;
@@ -1650,7 +1650,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5, T6, T7>)other);
@@ -1693,7 +1693,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5, T6, T7>)other;
@@ -1936,7 +1936,7 @@ int IComparable.CompareTo(object? other)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             return CompareTo((ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>)other);
@@ -1982,7 +1982,7 @@ int IStructuralComparable.CompareTo(object? other, IComparer comparer)
 
             if (!(other is ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>))
             {
-                ThrowHelper.ThrowArgumentException_TupleIncorrectType (this);
+                ThrowHelper.ThrowArgumentException_TupleIncorrectType(this);
             }
 
             var objTuple = (ValueTuple<T1, T2, T3, T4, T5, T6, T7, TRest>)other;