From 73b8112865f9b4a0aa7576cb5bf2747a08cfb652 Mon Sep 17 00:00:00 2001
From: Justin Van Patten <jvp@justinvp.com>
Date: Wed, 14 Sep 2016 17:48:51 -0700
Subject: [PATCH] Minor String.Split cleanup to align more closely with CoreRT
 (#7185)

---
 src/mscorlib/src/System/String.Manipulation.cs | 30 ++++++++++----------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/mscorlib/src/System/String.Manipulation.cs b/src/mscorlib/src/System/String.Manipulation.cs
index 8f456b6..d21c068 100644
--- a/src/mscorlib/src/System/String.Manipulation.cs
+++ b/src/mscorlib/src/System/String.Manipulation.cs
@@ -1006,17 +1006,13 @@ namespace System
             return SplitInternal(pSeparators, /*separatorsLength*/ 1, count, options);
         }
 
-        [ComVisible(false)]
         [System.Security.SecuritySafeCritical]
-        internal String[] SplitInternal(char[] separator, int count, StringSplitOptions options)
+        private unsafe String[] SplitInternal(char[] separator, int count, StringSplitOptions options)
         {
-            unsafe
+            fixed (char* pSeparators = separator)
             {
-                fixed (char* pSeparators = separator)
-                {
-                    int separatorsLength = separator == null ? 0 : separator.Length;
-                    return SplitInternal(pSeparators, separatorsLength, count, options);
-                }
+                int separatorsLength = separator == null ? 0 : separator.Length;
+                return SplitInternal(pSeparators, separatorsLength, count, options);
             }
         }
 
@@ -1060,11 +1056,11 @@ namespace System
 
             if(omitEmptyEntries) 
             {
-                return InternalSplitOmitEmptyEntries(sepList, null, 1, numReplaces, count);
+                return SplitOmitEmptyEntries(sepList, null, 1, numReplaces, count);
             }
             else 
             {
-                return InternalSplitKeepEmptyEntries(sepList, null, 1, numReplaces, count);
+                return SplitKeepEmptyEntries(sepList, null, 1, numReplaces, count);
             }            
         }
 
@@ -1122,14 +1118,10 @@ namespace System
 #endif
             }
 
-            if (count == 1) {
+            if (count == 1 || (singleSeparator && separator.Length == 0)) {
                 return new String[] { this };
             }
 
-            if (singleSeparator && separator.Length == 0) {
-                return new[] { this };
-            }
-
             int[] sepList = new int[Length];
             int[] lengthList;
             int defaultLength;
@@ -1152,10 +1144,10 @@ namespace System
             }
             
             if (omitEmptyEntries) {
-                return InternalSplitOmitEmptyEntries(sepList, lengthList, defaultLength, numReplaces, count);
+                return SplitOmitEmptyEntries(sepList, lengthList, defaultLength, numReplaces, count);
             }
             else {
-                return InternalSplitKeepEmptyEntries(sepList, lengthList, defaultLength, numReplaces, count);
+                return SplitKeepEmptyEntries(sepList, lengthList, defaultLength, numReplaces, count);
             }
         }                        
         
@@ -1164,7 +1156,7 @@ namespace System
         //     the original string will be returned regardless of the count. 
         //
 
-        private String[] InternalSplitKeepEmptyEntries(Int32[] sepList, Int32[] lengthList, Int32 defaultLength, Int32 numReplaces, int count) {
+        private String[] SplitKeepEmptyEntries(Int32[] sepList, Int32[] lengthList, Int32 defaultLength, Int32 numReplaces, int count) {
             Contract.Requires(numReplaces >= 0);
             Contract.Requires(count >= 2);
             Contract.Ensures(Contract.Result<String[]>() != null);
@@ -1200,7 +1192,7 @@ namespace System
 
         
         // This function will not keep the Empty String 
-        private String[] InternalSplitOmitEmptyEntries(Int32[] sepList, Int32[] lengthList, Int32 defaultLength, Int32 numReplaces, int count) {
+        private String[] SplitOmitEmptyEntries(Int32[] sepList, Int32[] lengthList, Int32 defaultLength, Int32 numReplaces, int count) {
             Contract.Requires(numReplaces >= 0);
             Contract.Requires(count >= 2);
             Contract.Ensures(Contract.Result<String[]>() != null);
-- 
2.7.4