Reverted r361134 because of a failing test left unattended for a long time.

http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/17792/steps/test-check-all/logs/stdio
Failing Tests (1):
    LLVM :: CodeGen/AMDGPU/regbank-reassign.mir

llvm-svn: 361430

1 files changed, 8 insertions, 6 deletions

diff --git a/llvm/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp b/llvm/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
index c20b4714e2b..96e074da122 100644
--- a/llvm/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
@@ -158,8 +158,10 @@ void JITLinkerBase::layOutAtoms() {
     };
     for (auto &KV : Layout) {
       auto &SL = KV.second;
-      llvm::sort(SL.ContentSections, CompareByOrdinal);
-      llvm::sort(SL.ZeroFillSections, CompareByOrdinal);
+      std::sort(SL.ContentSections.begin(), SL.ContentSections.end(),
+                CompareByOrdinal);
+      std::sort(SL.ZeroFillSections.begin(), SL.ZeroFillSections.end(),
+                CompareByOrdinal);
     }
   }
 
@@ -186,10 +188,10 @@ void JITLinkerBase::layOutAtoms() {
           OrderedLayoutHeads.push_back(DA);
 
         // Now sort the list of layout heads by address.
-        llvm::sort(OrderedLayoutHeads,
-                   [](const DefinedAtom *LHS, const DefinedAtom *RHS) {
-                     return LHS->getAddress() < RHS->getAddress();
-                   });
+        std::sort(OrderedLayoutHeads.begin(), OrderedLayoutHeads.end(),
+                  [](const DefinedAtom *LHS, const DefinedAtom *RHS) {
+                    return LHS->getAddress() < RHS->getAddress();
+                  });
 
         // Now populate the SI.Atoms field by appending each of the chains.
         for (auto *DA : OrderedLayoutHeads) {