From 73fa28f5088a9f88d1b38dd62b5f8d43c350f605 Mon Sep 17 00:00:00 2001
From: Grant <grant@jesanna.com>
Date: Fri, 5 Apr 2019 07:02:23 -0700
Subject: [PATCH] Revert optimization (#23759)

---
 .../shared/System/MemoryExtensions.Trim.cs         | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/System.Private.CoreLib/shared/System/MemoryExtensions.Trim.cs b/src/System.Private.CoreLib/shared/System/MemoryExtensions.Trim.cs
index be98bb1..96581c7 100644
--- a/src/System.Private.CoreLib/shared/System/MemoryExtensions.Trim.cs
+++ b/src/System.Private.CoreLib/shared/System/MemoryExtensions.Trim.cs
@@ -18,7 +18,7 @@ namespace System
         {
             ReadOnlySpan<T> span = memory.Span;
             int start = ClampStart(span, trimElement);
-            int length = ClampEnd(span, start + 1, trimElement);
+            int length = ClampEnd(span, start, trimElement);
             return memory.Slice(start, length);
         }
 
@@ -50,7 +50,7 @@ namespace System
         {
             ReadOnlySpan<T> span = memory.Span;
             int start = ClampStart(span, trimElement);
-            int length = ClampEnd(span, start + 1, trimElement);
+            int length = ClampEnd(span, start, trimElement);
             return memory.Slice(start, length);
         }
 
@@ -81,7 +81,7 @@ namespace System
             where T : IEquatable<T>
         {
             int start = ClampStart(span, trimElement);
-            int length = ClampEnd(span, start + 1, trimElement);
+            int length = ClampEnd(span, start, trimElement);
             return span.Slice(start, length);
         }
 
@@ -112,7 +112,7 @@ namespace System
             where T : IEquatable<T>
         {
             int start = ClampStart(span, trimElement);
-            int length = ClampEnd(span, start + 1, trimElement);
+            int length = ClampEnd(span, start, trimElement);
             return span.Slice(start, length);
         }
 
@@ -220,7 +220,7 @@ namespace System
             {
                 ReadOnlySpan<T> span = memory.Span;
                 int start = ClampStart(span, trimElements);
-                int length = ClampEnd(span, start + 1, trimElements);
+                int length = ClampEnd(span, start, trimElements);
                 return memory.Slice(start, length);
             }
 
@@ -292,7 +292,7 @@ namespace System
             {
                 ReadOnlySpan<T> span = memory.Span;
                 int start = ClampStart(span, trimElements);
-                int length = ClampEnd(span, start + 1, trimElements);
+                int length = ClampEnd(span, start, trimElements);
                 return memory.Slice(start, length);
             }
 
@@ -364,7 +364,7 @@ namespace System
             if (trimElements.Length > 1)
             {
                 int start = ClampStart(span, trimElements);
-                int length = ClampEnd(span, start + 1, trimElements);
+                int length = ClampEnd(span, start, trimElements);
                 return span.Slice(start, length);
             }
 
@@ -435,7 +435,7 @@ namespace System
             if (trimElements.Length > 1)
             {
                 int start = ClampStart(span, trimElements);
-                int length = ClampEnd(span, start + 1, trimElements);
+                int length = ClampEnd(span, start, trimElements);
                 return span.Slice(start, length);
             }
 
@@ -547,7 +547,7 @@ namespace System
         {
             ReadOnlySpan<char> span = memory.Span;
             int start = ClampStart(span);
-            int length = ClampEnd(span, start + 1);
+            int length = ClampEnd(span, start);
             return memory.Slice(start, length);
         }
 
@@ -573,7 +573,7 @@ namespace System
         {
             ReadOnlySpan<char> span = memory.Span;
             int start = ClampStart(span);
-            int length = ClampEnd(span, start + 1);
+            int length = ClampEnd(span, start);
             return memory.Slice(start, length);
         }
 
@@ -803,7 +803,7 @@ namespace System
         public static Span<char> Trim(this Span<char> span)
         {
             int start = ClampStart(span);
-            int length = ClampEnd(span, start + 1);
+            int length = ClampEnd(span, start);
             return span.Slice(start, length);
         }
 
-- 
2.7.4