Merge branch 'master' into proxyenumerator

Author: leirocks

lib/Backend/SwitchIRBuilder.cpp

@@ -3,7 +3,6 @@
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #include "Backend.h"
-#include "DataStructures/quicksort.h"
 
 ///----------------------------------------------------------------------------
 ///

lib/Common/Core/ProfileMemory.cpp

@@ -5,7 +5,6 @@
 #include "CommonCorePch.h"
 
 #ifdef PROFILE_MEM
-#include "DataStructures/quicksort.h"
 #include "Memory/AutoPtr.h"
 #include "Core/ProfileMemory.h"
 
@@ -308,7 +307,8 @@ int MemoryProfiler::CreateArenaUsageSummary(ArenaAllocator * alloc, bool liveOnl
     {
         name[i++] = key;
     });
-    JsUtil::QuickSort<LPWSTR, DefaultComparer<LPWSTR>>::Sort(name, name + (count - 1));
+
+    qsort_s(name, count, sizeof(LPWSTR), [](void*, const void* a, const void* b) { return DefaultComparer<LPWSTR>::Compare(*(LPWSTR*)a, *(LPWSTR*)b); }, nullptr);
 
     summaries = AnewArray(alloc, ArenaMemoryDataSummary *, count);
 

lib/Common/DataStructures/Chakra.Common.DataStructures.vcxproj

@@ -80,7 +80,6 @@
     <ClInclude Include="KeyValuePair.h" />
     <ClInclude Include="LargeStack.h" />
     <ClInclude Include="List.h" />
-    <ClInclude Include="quicksort.h" />
     <ClInclude Include="SimpleHashTable.h" />
     <ClInclude Include="SList.h" />
     <ClInclude Include="SparseArray.h" />
@@ -99,4 +98,4 @@
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

lib/Common/DataStructures/ImmutableList.h

@@ -704,7 +704,9 @@ namespace regex
                 return this;
             }
             auto arr = ToReferenceArrayInHeap(size);
-            QuickSort<T *, true>::Sort(arr, arr+(size-1), comparer);
+            qsort_s(arr, size, sizeof(T*), [](void* comparer, const void* a, const void* b) {
+                return ((regex::Comparer<T *> *)comparer)->Compare(*(T**)a, *(T**)b);
+            }, comparer);
 
             // Convert the reference Array into the List
             auto result = (ImmutableList<T>*)(arr[0] - offsetof(ImmutableList<T>, value));
@@ -729,7 +731,9 @@ namespace regex
                 return this;
             }
             auto arr = ToReferenceArrayInHeap(size);
-            QuickSort<T *, true>::Sort(arr, arr+(size-1), comparer);
+            qsort_s(arr, size, sizeof(T*), [](void* comparer, const void* a, const void* b) {
+                return ((regex::Comparer<T *> *)comparer)->Compare(*(T**)a, *(T**)b);
+            }, comparer);
 
             // Convert the reference Array into the List
             auto result = (ImmutableList<T>*)(arr[0] - offsetof(ImmutableList<T>, value));

lib/Common/DataStructures/List.h

@@ -479,13 +479,9 @@ namespace JsUtil
 
         void Sort()
         {
-            // We can call QSort only if the remove policy for this list is CopyRemovePolicy
-            CompileAssert((IsSame<TRemovePolicyType, Js::CopyRemovePolicy<TListType, false> >::IsTrue) ||
-                (IsSame<TRemovePolicyType, Js::CopyRemovePolicy<TListType, true> >::IsTrue));
-            if(this->count)
-            {
-                JsUtil::QuickSort<T, TComparerType>::Sort(this->buffer, this->buffer + (this->count - 1));
-            }
+            Sort([](void *, const void * a, const void * b) {
+                return TComparerType::Compare(*(T*)a, *(T*)b);
+            }, nullptr);
         }
 
         void Sort(int(__cdecl * _PtFuncCompare)(void *, const void *, const void *), void *_Context)