Merge pull request #14394 from stephentoub/undo_strcomp

Undo unnecessary change from DateTime.Parse commit

1 files changed, 11 insertions, 3 deletions

diff --git a/src/mscorlib/src/System/String.Comparison.cs b/src/mscorlib/src/System/String.Comparison.cs
index 8e628d92ec..fd318b3d08 100644
--- a/src/mscorlib/src/System/String.Comparison.cs
+++ b/src/mscorlib/src/System/String.Comparison.cs
@@ -219,12 +219,20 @@ namespace System
             }
         }
 
-        private unsafe static int CompareOrdinalHelper(string strA, string strB)
+        private static unsafe int CompareOrdinalHelper(String strA, String strB)
         {
+            Debug.Assert(strA != null);
+            Debug.Assert(strB != null);
+
+            // NOTE: This may be subject to change if eliminating the check
+            // in the callers makes them small enough to be inlined
+            Debug.Assert(strA._firstChar == strB._firstChar,
+                "For performance reasons, callers of this method should " +
+                "check/short-circuit beforehand if the first char is the same.");
+
             int length = Math.Min(strA.Length, strB.Length);
 
-            fixed (char* ap = strA)
-            fixed (char* bp = strB)
+            fixed (char* ap = &strA._firstChar) fixed (char* bp = &strB._firstChar)
             {
                 char* a = ap;
                 char* b = bp;