From e7f7e5fe4a55ee66e4ef106396c9dda77eb419eb Mon Sep 17 00:00:00 2001
From: Patrick McDonald <paddymcdonald@gmail.com>
Date: Tue, 13 Jun 2017 05:34:56 +0100
Subject: [PATCH] FX_NO_ARRAY_KEY_SORT was not used outside of portable builds
 (#3200)

---
 src/fsharp/FSharp.Core/local.fs | 72 ---------------------------------
 1 file changed, 72 deletions(-)

diff --git a/src/fsharp/FSharp.Core/local.fs b/src/fsharp/FSharp.Core/local.fs
index 7df2e049e..1a883eec0 100644
--- a/src/fsharp/FSharp.Core/local.fs
+++ b/src/fsharp/FSharp.Core/local.fs
@@ -925,81 +925,9 @@ module internal List =
 module internal Array = 
 
     open System
-    open System.Collections.Generic
-
-#if FX_NO_ARRAY_KEY_SORT
-    // Mimic behavior of BCL QSort routine, used under the hood by various array sorting APIs
-    let qsort<'Key,'Value>(keys : 'Key[], values : 'Value[], start : int, last : int, comparer : IComparer<'Key>) =  
-            let valuesExist = 
-                match values with
-                | null -> false
-                | _ -> true
-                
-            let swap (p1, p2) =
-                let tk = keys.[p1]
-                keys.[p1] <- keys.[p2]
-                keys.[p2] <- tk
-                if valuesExist then
-                    let tv = values.[p1]
-                    values.[p1] <- values.[p2]
-                    values.[p2] <- tv
-                    
-            let partition (left, right, pivot) =
-                let value = keys.[pivot]
-                swap (pivot, right)
-                let mutable store = left
-                
-                for i in left..(right - 1) do
-                    if comparer.Compare(keys.[i],value) < 0 then
-                        swap(i, store)
-                        store <- store + 1
-
-                swap (store, right)
-                store
-            
-            let rec qs (left, right) =
-                if left < right then
-                    let pivot = left + (right-left)/2
-                    let newpivot = partition(left,right,pivot)
-                    qs(left,newpivot - 1)
-                    qs(newpivot+1,right)
-            
-            qs(start, last)
-            
-    type System.Array with
-        static member Sort<'Key,'Value>(keys : 'Key[], values : 'Value[], comparer : IComparer<'Key>) =
-            let valuesExist = 
-                match values with
-                | null -> false
-                | _ -> true
-            match keys,values with
-            | null,_ -> raise (ArgumentNullException())
-            | _,_ when valuesExist && (keys.Length <> values.Length) -> raise (ArgumentException())
-            | _,_ -> qsort(keys, values, 0, keys.Length-1, comparer)
-
-        static member Sort<'Key,'Value  when 'Key : comparison>(keys : 'Key[], values : 'Value[]) =
-            let valuesExist = 
-                match values with
-                | null -> false
-                | _ -> true
-            match keys,values with
-            | null,_ -> raise (ArgumentNullException())
-            | _,_ when valuesExist && (keys.Length <> values.Length) -> raise (ArgumentException())
-            | _,_ -> qsort(keys,values,0,keys.Length-1,LanguagePrimitives.FastGenericComparer<'Key>)
-
-        static member Sort<'Key,'Value>(keys : 'Key[], values : 'Value[], start : int, length : int, comparer : IComparer<'Key>) =
-            match keys with
-            | null -> raise (ArgumentNullException())
-            | _ -> qsort(keys,values,start,start+length-1,comparer)
-#else
-#endif
 
     let inline fastComparerForArraySort<'t when 't : comparison> () =
-#if FX_NO_ARRAY_KEY_SORT
-        LanguagePrimitives.FastGenericComparer<'t>
-#else
         LanguagePrimitives.FastGenericComparerCanBeNull<'t>
-#endif        
 
     // The input parameter should be checked by callers if necessary
     let inline zeroCreateUnchecked (count:int) = 
-- 
GitLab