From 35e2e8d045c441f64fefbfd219b9d30ec7ed3cb6 Mon Sep 17 00:00:00 2001
From: Galina Kistanova <gkistanova@gmail.com>
Date: Wed, 22 May 2019 20:42:56 +0000
Subject: [PATCH] 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


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361430 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../CodeView/DebugFrameDataSubsection.cpp          |  7 ++++---
 lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp     | 14 ++++++++------
 lib/Target/AMDGPU/GCNRegBankReassign.cpp           |  2 +-
 lib/Target/XCore/XCoreFrameLowering.cpp            |  1 +
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/DebugInfo/CodeView/DebugFrameDataSubsection.cpp b/lib/DebugInfo/CodeView/DebugFrameDataSubsection.cpp
index 9bc69abea10..be8c32d5b29 100644
--- a/lib/DebugInfo/CodeView/DebugFrameDataSubsection.cpp
+++ b/lib/DebugInfo/CodeView/DebugFrameDataSubsection.cpp
@@ -47,9 +47,10 @@ Error DebugFrameDataSubsection::commit(BinaryStreamWriter &Writer) const {
   }
 
   std::vector<FrameData> SortedFrames(Frames.begin(), Frames.end());
-  llvm::sort(SortedFrames, [](const FrameData &LHS, const FrameData &RHS) {
-    return LHS.RvaStart < RHS.RvaStart;
-  });
+  std::sort(SortedFrames.begin(), SortedFrames.end(),
+            [](const FrameData &LHS, const FrameData &RHS) {
+              return LHS.RvaStart < RHS.RvaStart;
+            });
   if (auto EC = Writer.writeArray(makeArrayRef(SortedFrames)))
     return EC;
   return Error::success();
diff --git a/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp b/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
index c20b4714e2b..96e074da122 100644
--- a/lib/ExecutionEngine/JITLink/JITLinkGeneric.cpp
+++ b/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) {
diff --git a/lib/Target/AMDGPU/GCNRegBankReassign.cpp b/lib/Target/AMDGPU/GCNRegBankReassign.cpp
index fc95166354c..fcbc3cddf6e 100644
--- a/lib/Target/AMDGPU/GCNRegBankReassign.cpp
+++ b/lib/Target/AMDGPU/GCNRegBankReassign.cpp
@@ -649,7 +649,7 @@ unsigned GCNRegBankReassign::tryReassign(Candidate &C) {
       }
     }
   }
-  llvm::sort(BankStalls);
+  std::sort(BankStalls.begin(), BankStalls.end());
 
   unsigned OrigReg = VRM->getPhys(C.Reg);
   LRM->unassign(LI);
diff --git a/lib/Target/XCore/XCoreFrameLowering.cpp b/lib/Target/XCore/XCoreFrameLowering.cpp
index 8b313150609..5066407c74a 100644
--- a/lib/Target/XCore/XCoreFrameLowering.cpp
+++ b/lib/Target/XCore/XCoreFrameLowering.cpp
@@ -27,6 +27,7 @@
 #include "llvm/IR/Function.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Target/TargetOptions.h"
+#include <algorithm> // std::sort
 
 using namespace llvm;
 
-- 
2.40.0