[LLVMSupport] Re-namespace the LLVMSupport fork after re-forking by re-applying b72788c

compnerd · kubamracek · commit 5ae5ce10c7c5 · 2021-12-03T09:35:05.000-08:00
More precisely: 1) git cherry-pick b72788c 2) manually resolve the conflict in AlignOf.h by keeping the HEAD's version of the chunk and discarding the cherry-pick's change 3) git add AlignOf.h 4) git status | grep "deleted by us" | awk '{print($4)}' | xargs git rm 5) git cherry-pick --continue Original namespacing commit message: > This adds the `__swift::__runtime` inline namespace to the LLVMSupport > interfaces. This avoids an ODR violation when LLVM and Swift are in the > same address space. It also will aid in the process of pruning the > LLVMSupport library by ensuring that accidental leakage of the llvm > namespace does not allow us to remove symbols which we rely on.
diff --git a/stdlib/include/llvm/ADT/ArrayRef.h b/stdlib/include/llvm/ADT/ArrayRef.h
@@ -24,6 +24,7 @@
 #include <type_traits>
 #include <vector>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
   template<typename T> struct DenseMapInfo;
@@ -601,5 +602,6 @@ namespace llvm {
   };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_ARRAYREF_H
diff --git a/stdlib/include/llvm/ADT/DenseMap.h b/stdlib/include/llvm/ADT/DenseMap.h
@@ -31,6 +31,7 @@
 #include <type_traits>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 namespace detail {
@@ -1304,5 +1305,6 @@ inline size_t capacity_in_bytes(const DenseMap<KeyT, ValueT, KeyInfoT> &X) {
 }
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_DENSEMAP_H
diff --git a/stdlib/include/llvm/ADT/DenseMapInfo.h b/stdlib/include/llvm/ADT/DenseMapInfo.h
@@ -20,6 +20,7 @@
 #include <tuple>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 namespace detail {
@@ -291,5 +292,6 @@ template <> struct DenseMapInfo<hash_code> {
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_DENSEMAPINFO_H
diff --git a/stdlib/include/llvm/ADT/DenseSet.h b/stdlib/include/llvm/ADT/DenseSet.h
@@ -23,6 +23,7 @@
 #include <iterator>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 namespace detail {
@@ -298,5 +299,6 @@ class SmallDenseSet
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_DENSESET_H
diff --git a/stdlib/include/llvm/ADT/Hashing.h b/stdlib/include/llvm/ADT/Hashing.h
@@ -55,6 +55,7 @@
 #include <tuple>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// An opaque object representing a hash code.
@@ -678,5 +679,6 @@ hash_code hash_value(const std::basic_string<T> &arg) {
 }
 
 } // namespace llvm
+}} // namespace swift::runtime
 
 #endif
diff --git a/stdlib/include/llvm/ADT/None.h b/stdlib/include/llvm/ADT/None.h
@@ -15,12 +15,14 @@
 #ifndef LLVM_ADT_NONE_H
 #define LLVM_ADT_NONE_H
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 /// A simple null object to allow implicit construction of Optional<T>
 /// and similar types without having to spell out the specialization's name.
 // (constant value 1 in an attempt to workaround MSVC build issue... )
 enum class NoneType { None = 1 };
 const NoneType None = NoneType::None;
 }
+}} // swift::runtime
 
 #endif
diff --git a/stdlib/include/llvm/ADT/Optional.h b/stdlib/include/llvm/ADT/Optional.h
@@ -25,6 +25,7 @@
 #include <new>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 class raw_ostream;
@@ -492,5 +493,6 @@ raw_ostream &operator<<(raw_ostream &OS, const Optional<T> &O) {
 }
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_OPTIONAL_H
diff --git a/stdlib/include/llvm/ADT/PointerIntPair.h b/stdlib/include/llvm/ADT/PointerIntPair.h
@@ -20,6 +20,7 @@
 #include <cstdint>
 #include <limits>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 template <typename T> struct DenseMapInfo;
@@ -240,5 +241,6 @@ struct PointerLikeTypeTraits<
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_POINTERINTPAIR_H
diff --git a/stdlib/include/llvm/ADT/PointerUnion.h b/stdlib/include/llvm/ADT/PointerUnion.h
@@ -21,6 +21,7 @@
 #include <cstddef>
 #include <cstdint>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 template <typename T> struct PointerUnionTypeSelectorReturn {
@@ -288,5 +289,6 @@ template <typename ...PTs> struct DenseMapInfo<PointerUnion<PTs...>> {
 };
 
 } // end namespace llvm
+}} // swift::runtime
 
 #endif // LLVM_ADT_POINTERUNION_H
diff --git a/stdlib/include/llvm/ADT/STLExtras.h b/stdlib/include/llvm/ADT/STLExtras.h
@@ -40,6 +40,7 @@
 #include <random> // for std::mt19937
 #endif
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 // Only used by compiler if both template types are the same.  Useful when
@@ -2067,5 +2068,6 @@ template <class Ptr> auto to_address(const Ptr &P) { return P.operator->(); }
 template <class T> constexpr T *to_address(T *P) { return P; }
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_STLEXTRAS_H
diff --git a/stdlib/include/llvm/ADT/SmallPtrSet.h b/stdlib/include/llvm/ADT/SmallPtrSet.h
@@ -26,6 +26,7 @@
 #include <iterator>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// SmallPtrSetImplBase - This is the common code shared among all the
@@ -503,6 +504,7 @@ class SmallPtrSet : public SmallPtrSetImpl<PtrType> {
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 namespace std {
 
diff --git a/stdlib/include/llvm/ADT/SmallString.h b/stdlib/include/llvm/ADT/SmallString.h
@@ -17,6 +17,7 @@
 #include "llvm/ADT/StringRef.h"
 #include <cstddef>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// SmallString - A SmallString is just a SmallVector with methods and accessors
@@ -289,5 +290,6 @@ class SmallString : public SmallVector<char, InternalLen> {
 };
 
 } // end namespace llvm
+}} // swift::runtime
 
 #endif // LLVM_ADT_SMALLSTRING_H
diff --git a/stdlib/include/llvm/ADT/SmallVector.h b/stdlib/include/llvm/ADT/SmallVector.h
@@ -32,6 +32,7 @@
 #include <type_traits>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// This is all the stuff common to all SmallVectors.
@@ -1251,20 +1252,23 @@ to_vector(R &&Range) {
 }
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 namespace std {
 
   /// Implement std::swap in terms of SmallVector swap.
   template<typename T>
   inline void
-  swap(llvm::SmallVectorImpl<T> &LHS, llvm::SmallVectorImpl<T> &RHS) {
+  swap(__swift::__runtime::llvm::SmallVectorImpl<T> &LHS,
+       __swift::__runtime::llvm::SmallVectorImpl<T> &RHS) {
     LHS.swap(RHS);
   }
 
   /// Implement std::swap in terms of SmallVector swap.
   template<typename T, unsigned N>
   inline void
-  swap(llvm::SmallVector<T, N> &LHS, llvm::SmallVector<T, N> &RHS) {
+  swap(__swift::__runtime::llvm::SmallVector<T, N> &LHS,
+       __swift::__runtime::llvm::SmallVector<T, N> &RHS) {
     LHS.swap(RHS);
   }
 
diff --git a/stdlib/include/llvm/ADT/StringExtras.h b/stdlib/include/llvm/ADT/StringExtras.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 template<typename T> class SmallVectorImpl;
@@ -502,5 +503,6 @@ class ListSeparator {
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_STRINGEXTRAS_H
diff --git a/stdlib/include/llvm/ADT/StringRef.h b/stdlib/include/llvm/ADT/StringRef.h
@@ -30,6 +30,7 @@
 extern "C" size_t __builtin_strlen(const char *);
 #endif
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
   class APInt;
@@ -978,5 +979,6 @@ namespace llvm {
   };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_STRINGREF_H
diff --git a/stdlib/include/llvm/ADT/StringSwitch.h b/stdlib/include/llvm/ADT/StringSwitch.h
@@ -17,6 +17,7 @@
 #include <cassert>
 #include <cstring>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// A switch()-like statement whose cases are string literals.
@@ -192,5 +193,6 @@ class StringSwitch {
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_STRINGSWITCH_H
diff --git a/stdlib/include/llvm/ADT/Twine.h b/stdlib/include/llvm/ADT/Twine.h
@@ -19,6 +19,7 @@
 #include <string_view>
 #endif
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
   class formatv_object_base;
@@ -562,5 +563,6 @@ namespace llvm {
   /// @}
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_TWINE_H
diff --git a/stdlib/include/llvm/ADT/iterator.h b/stdlib/include/llvm/ADT/iterator.h
@@ -15,6 +15,7 @@
 #include <type_traits>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// CRTP base class which implements the entire standard iterator facade
@@ -351,5 +352,6 @@ using raw_pointer_iterator =
     pointer_iterator<pointee_iterator<WrappedIteratorT, T1>, T2>;
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_ADT_ITERATOR_H
diff --git a/stdlib/include/llvm/ADT/iterator_range.h b/stdlib/include/llvm/ADT/iterator_range.h
@@ -20,6 +20,7 @@
 
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// A range adaptor for a pair of iterators.
@@ -59,5 +60,6 @@ template <typename T> iterator_range<T> make_range(std::pair<T, T> p) {
 }
 
 }
+}} // namespace swift::runtime
 
 #endif
diff --git a/stdlib/include/llvm/Support/AlignOf.h b/stdlib/include/llvm/Support/AlignOf.h
@@ -15,6 +15,7 @@
 
 #include <type_traits>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// A suitably aligned and sized character array member which can hold elements
@@ -30,5 +31,6 @@ template <typename T, typename... Ts> struct AlignedCharArrayUnion {
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_SUPPORT_ALIGNOF_H
diff --git a/stdlib/include/llvm/Support/Alignment.h b/stdlib/include/llvm/Support/Alignment.h
@@ -28,6 +28,7 @@
 #include <string>
 #endif // NDEBUG
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 #define ALIGN_CHECK_ISPOSITIVE(decl)                                           \
@@ -361,5 +362,6 @@ inline std::string DebugStr(const MaybeAlign &MA) {
 #undef ALIGN_CHECK_ISPOSITIVE
 
 } // namespace llvm
+}} // namespace swift::runtime
 
 #endif // LLVM_SUPPORT_ALIGNMENT_H_
diff --git a/stdlib/include/llvm/Support/Allocator.h b/stdlib/include/llvm/Support/Allocator.h
@@ -34,6 +34,7 @@
 #include <type_traits>
 #include <utility>
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 namespace detail {
@@ -427,22 +428,27 @@ template <typename T> class SpecificBumpPtrAllocator {
 };
 
 } // end namespace llvm
+}} // namespace swift::runtime
 
 template <typename AllocatorT, size_t SlabSize, size_t SizeThreshold,
           size_t GrowthDelay>
 void *
 operator new(size_t Size,
-             llvm::BumpPtrAllocatorImpl<AllocatorT, SlabSize, SizeThreshold,
-                                        GrowthDelay> &Allocator) {
+             __swift::__runtime::llvm::BumpPtrAllocatorImpl<AllocatorT,
+                                                            SlabSize,
+                                                            SizeThreshold,
+                                                            GrowthDelay> &Allocator) {
   return Allocator.Allocate(Size, std::min((size_t)llvm::NextPowerOf2(Size),
                                            alignof(std::max_align_t)));
 }
 
 template <typename AllocatorT, size_t SlabSize, size_t SizeThreshold,
           size_t GrowthDelay>
 void operator delete(void *,
-                     llvm::BumpPtrAllocatorImpl<AllocatorT, SlabSize,
-                                                SizeThreshold, GrowthDelay> &) {
+                     __swift::__runtime::llvm::BumpPtrAllocatorImpl<AllocatorT,
+                                                                    SlabSize,
+                                                                    SizeThreshold,
+                                                                    GrowthDelay> &) {
 }
 
 #endif // LLVM_SUPPORT_ALLOCATOR_H
diff --git a/stdlib/include/llvm/Support/AllocatorBase.h b/stdlib/include/llvm/Support/AllocatorBase.h
@@ -22,6 +22,7 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MemAlloc.h"
 
+inline namespace __swift { inline namespace __runtime {
 namespace llvm {
 
 /// CRTP base class providing obvious overloads for the core \c
@@ -99,5 +100,6 @@ class MallocAllocator : public AllocatorBase<MallocAllocator> {
 };
 
 } // namespace llvm
+}} // inline namespace swift::runtime
 
 #endif // LLVM_SUPPORT_ALLOCATORBASE_H
diff --git a/stdlib/include/llvm/Support/Atomic.h b/stdlib/include/llvm/Support/Atomic.h
diff --git a/stdlib/include/llvm/Support/Casting.h b/stdlib/include/llvm/Support/Casting.h
diff --git a/stdlib/include/llvm/Support/ErrorHandling.h b/stdlib/include/llvm/Support/ErrorHandling.h
diff --git a/stdlib/include/llvm/Support/MathExtras.h b/stdlib/include/llvm/Support/MathExtras.h
diff --git a/stdlib/include/llvm/Support/MemAlloc.h b/stdlib/include/llvm/Support/MemAlloc.h
diff --git a/stdlib/include/llvm/Support/PointerLikeTypeTraits.h b/stdlib/include/llvm/Support/PointerLikeTypeTraits.h
diff --git a/stdlib/include/llvm/Support/SwapByteOrder.h b/stdlib/include/llvm/Support/SwapByteOrder.h
diff --git a/stdlib/include/llvm/Support/raw_ostream.h b/stdlib/include/llvm/Support/raw_ostream.h
diff --git a/stdlib/include/llvm/Support/type_traits.h b/stdlib/include/llvm/Support/type_traits.h
diff --git a/stdlib/public/LLVMSupport/ErrorHandling.cpp b/stdlib/public/LLVMSupport/ErrorHandling.cpp
diff --git a/stdlib/public/LLVMSupport/StringRef.cpp b/stdlib/public/LLVMSupport/StringRef.cpp
