Merge pull request swiftlang#30029 from gribozavr/rm-algorithm

Replaced include/swift/Basic/Algorithm.h with calls to standard algorithms

Author: gribozavr

include/swift/Basic/Algorithm.h

@@ -17,13 +17,12 @@
 #ifndef SWIFT_BASIC_FLAGGEDPOINTER_H
 #define SWIFT_BASIC_FLAGGEDPOINTER_H
 
+#include <algorithm>
 #include <cassert>
 
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/PointerLikeTypeTraits.h"
 
-#include "Algorithm.h"
-
 namespace swift {
 
 /// This class implements a pair of a pointer and boolean flag.
@@ -170,7 +169,7 @@ struct llvm::PointerLikeTypeTraits<
   enum {
     NumLowBitsAvailable = (BitPosition >= PtrTraits::NumLowBitsAvailable)
       ? PtrTraits::NumLowBitsAvailable
-      : (swift::min(int(BitPosition + 1),
+      : (std::min(int(BitPosition + 1),
         int(PtrTraits::NumLowBitsAvailable)) - 1)
   };
 };

include/swift/Basic/FlaggedPointer.h

@@ -34,7 +34,6 @@
 #ifndef SWIFT_BASIC_PREFIXMAP_H
 #define SWIFT_BASIC_PREFIXMAP_H
 
-#include "swift/Basic/Algorithm.h"
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/type_traits.h"
@@ -53,8 +52,8 @@ template <class KeyElementType> class PrefixMapKeyPrinter;
 /// A map whose keys are sequences of comparable values, optimized for
 /// finding a mapped value for the longest matching initial subsequence.
 template <class KeyElementType, class ValueType,
-          size_t InlineKeyCapacity
-             = max<size_t>((sizeof(void*) - 1) / sizeof(KeyElementType), 1)>
+          size_t InlineKeyCapacity = std::max(
+              (sizeof(void *) - 1) / sizeof(KeyElementType), size_t(1))>
 class PrefixMap {
 public:
   using KeyType = ArrayRef<KeyElementType>;