mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-29 02:21:44 +00:00
[wpiutil] Upgrade to LLVM 17.0.1 (#5482)
This commit is contained in:
@@ -0,0 +1,167 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: PJ Reiniger <pj.reiniger@gmail.com>
|
||||
Date: Thu, 5 May 2022 23:18:34 -0400
|
||||
Subject: [PATCH 10/31] Detemplatize SmallVectorBase
|
||||
|
||||
---
|
||||
llvm/include/llvm/ADT/SmallVector.h | 27 +++++++--------------
|
||||
llvm/lib/Support/SmallVector.cpp | 37 +++++------------------------
|
||||
2 files changed, 14 insertions(+), 50 deletions(-)
|
||||
|
||||
diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
|
||||
index b42438a9b16c273f9ef5b5cce6192873c78cb964..7775ed7e8e083908f033529c30b1e4beae91b10a 100644
|
||||
--- a/llvm/include/llvm/ADT/SmallVector.h
|
||||
+++ b/llvm/include/llvm/ADT/SmallVector.h
|
||||
@@ -56,14 +56,14 @@ using EnableIfConvertibleToInputIterator = std::enable_if_t<std::is_convertible<
|
||||
/// Using 64 bit size is desirable for cases like SmallVector<char>, where a
|
||||
/// 32 bit size would limit the vector to ~4GB. SmallVectors are used for
|
||||
/// buffering bitcode output - which can exceed 4GB.
|
||||
-template <class Size_T> class SmallVectorBase {
|
||||
+class SmallVectorBase {
|
||||
protected:
|
||||
void *BeginX;
|
||||
- Size_T Size = 0, Capacity;
|
||||
+ unsigned Size = 0, Capacity;
|
||||
|
||||
/// The maximum value of the Size_T used.
|
||||
static constexpr size_t SizeTypeMax() {
|
||||
- return (std::numeric_limits<Size_T>::max)();
|
||||
+ return (std::numeric_limits<unsigned>::max)();
|
||||
}
|
||||
|
||||
SmallVectorBase() = delete;
|
||||
@@ -111,15 +111,10 @@ protected:
|
||||
}
|
||||
};
|
||||
|
||||
-template <class T>
|
||||
-using SmallVectorSizeType =
|
||||
- std::conditional_t<sizeof(T) < 4 && sizeof(void *) >= 8, uint64_t,
|
||||
- uint32_t>;
|
||||
-
|
||||
/// Figure out the offset of the first element.
|
||||
template <class T, typename = void> struct SmallVectorAlignmentAndSize {
|
||||
- alignas(SmallVectorBase<SmallVectorSizeType<T>>) char Base[sizeof(
|
||||
- SmallVectorBase<SmallVectorSizeType<T>>)];
|
||||
+ alignas(SmallVectorBase) char Base[sizeof(
|
||||
+ SmallVectorBase)];
|
||||
alignas(T) char FirstEl[sizeof(T)];
|
||||
};
|
||||
|
||||
@@ -128,8 +123,8 @@ template <class T, typename = void> struct SmallVectorAlignmentAndSize {
|
||||
/// to avoid unnecessarily requiring T to be complete.
|
||||
template <typename T, typename = void>
|
||||
class SmallVectorTemplateCommon
|
||||
- : public SmallVectorBase<SmallVectorSizeType<T>> {
|
||||
- using Base = SmallVectorBase<SmallVectorSizeType<T>>;
|
||||
+ : public SmallVectorBase {
|
||||
+ using Base = SmallVectorBase;
|
||||
|
||||
protected:
|
||||
/// Find the address of the first element. For this pointer math to be valid
|
||||
@@ -451,7 +446,7 @@ template <typename T, bool TriviallyCopyable>
|
||||
T *SmallVectorTemplateBase<T, TriviallyCopyable>::mallocForGrow(
|
||||
size_t MinSize, size_t &NewCapacity) {
|
||||
return static_cast<T *>(
|
||||
- SmallVectorBase<SmallVectorSizeType<T>>::mallocForGrow(
|
||||
+ SmallVectorBase::mallocForGrow(
|
||||
this->getFirstEl(), MinSize, sizeof(T), NewCapacity));
|
||||
}
|
||||
|
||||
@@ -1324,12 +1319,6 @@ template <typename Out, typename R> SmallVector<Out> to_vector_of(R &&Range) {
|
||||
return {std::begin(Range), std::end(Range)};
|
||||
}
|
||||
|
||||
-// Explicit instantiations
|
||||
-extern template class llvm::SmallVectorBase<uint32_t>;
|
||||
-#if SIZE_MAX > UINT32_MAX
|
||||
-extern template class llvm::SmallVectorBase<uint64_t>;
|
||||
-#endif
|
||||
-
|
||||
} // end namespace llvm
|
||||
|
||||
namespace std {
|
||||
diff --git a/llvm/lib/Support/SmallVector.cpp b/llvm/lib/Support/SmallVector.cpp
|
||||
index 6cefdff7c28060ca18b522acf5279af3a206e23a..ae64a36dcf4b9ceaf8767adbf8100f164f3738ac 100644
|
||||
--- a/llvm/lib/Support/SmallVector.cpp
|
||||
+++ b/llvm/lib/Support/SmallVector.cpp
|
||||
@@ -51,10 +51,6 @@ static_assert(sizeof(SmallVector<void *, 1>) ==
|
||||
sizeof(unsigned) * 2 + sizeof(void *) * 2,
|
||||
"wasted space in SmallVector size 1");
|
||||
|
||||
-static_assert(sizeof(SmallVector<char, 0>) ==
|
||||
- sizeof(void *) * 2 + sizeof(void *),
|
||||
- "1 byte elements have word-sized type for size and capacity");
|
||||
-
|
||||
/// Report that MinSize doesn't fit into this vector's size type. Throws
|
||||
/// std::length_error or calls report_fatal_error.
|
||||
[[noreturn]] static void report_size_overflow(size_t MinSize, size_t MaxSize);
|
||||
@@ -85,9 +81,8 @@ static void report_at_maximum_capacity(size_t MaxSize) {
|
||||
}
|
||||
|
||||
// Note: Moving this function into the header may cause performance regression.
|
||||
-template <class Size_T>
|
||||
static size_t getNewCapacity(size_t MinSize, size_t TSize, size_t OldCapacity) {
|
||||
- constexpr size_t MaxSize = std::numeric_limits<Size_T>::max();
|
||||
+ constexpr size_t MaxSize = std::numeric_limits<unsigned>::max();
|
||||
|
||||
// Ensure we can fit the new capacity.
|
||||
// This is only going to be applicable when the capacity is 32 bit.
|
||||
@@ -107,8 +102,7 @@ static size_t getNewCapacity(size_t MinSize, size_t TSize, size_t OldCapacity) {
|
||||
return std::clamp(NewCapacity, MinSize, MaxSize);
|
||||
}
|
||||
|
||||
-template <class Size_T>
|
||||
-void *SmallVectorBase<Size_T>::replaceAllocation(void *NewElts, size_t TSize,
|
||||
+void *SmallVectorBase::replaceAllocation(void *NewElts, size_t TSize,
|
||||
size_t NewCapacity,
|
||||
size_t VSize) {
|
||||
void *NewEltsReplace = llvm::safe_malloc(NewCapacity * TSize);
|
||||
@@ -119,11 +113,10 @@ void *SmallVectorBase<Size_T>::replaceAllocation(void *NewElts, size_t TSize,
|
||||
}
|
||||
|
||||
// Note: Moving this function into the header may cause performance regression.
|
||||
-template <class Size_T>
|
||||
-void *SmallVectorBase<Size_T>::mallocForGrow(void *FirstEl, size_t MinSize,
|
||||
+void *SmallVectorBase::mallocForGrow(void *FirstEl, size_t MinSize,
|
||||
size_t TSize,
|
||||
size_t &NewCapacity) {
|
||||
- NewCapacity = getNewCapacity<Size_T>(MinSize, TSize, this->capacity());
|
||||
+ NewCapacity = getNewCapacity(MinSize, TSize, this->capacity());
|
||||
// Even if capacity is not 0 now, if the vector was originally created with
|
||||
// capacity 0, it's possible for the malloc to return FirstEl.
|
||||
void *NewElts = llvm::safe_malloc(NewCapacity * TSize);
|
||||
@@ -133,10 +126,9 @@ void *SmallVectorBase<Size_T>::mallocForGrow(void *FirstEl, size_t MinSize,
|
||||
}
|
||||
|
||||
// Note: Moving this function into the header may cause performance regression.
|
||||
-template <class Size_T>
|
||||
-void SmallVectorBase<Size_T>::grow_pod(void *FirstEl, size_t MinSize,
|
||||
+void SmallVectorBase::grow_pod(void *FirstEl, size_t MinSize,
|
||||
size_t TSize) {
|
||||
- size_t NewCapacity = getNewCapacity<Size_T>(MinSize, TSize, this->capacity());
|
||||
+ size_t NewCapacity = getNewCapacity(MinSize, TSize, this->capacity());
|
||||
void *NewElts;
|
||||
if (BeginX == FirstEl) {
|
||||
NewElts = llvm::safe_malloc(NewCapacity * TSize);
|
||||
@@ -155,20 +147,3 @@ void SmallVectorBase<Size_T>::grow_pod(void *FirstEl, size_t MinSize,
|
||||
this->BeginX = NewElts;
|
||||
this->Capacity = NewCapacity;
|
||||
}
|
||||
-
|
||||
-template class llvm::SmallVectorBase<uint32_t>;
|
||||
-
|
||||
-// Disable the uint64_t instantiation for 32-bit builds.
|
||||
-// Both uint32_t and uint64_t instantiations are needed for 64-bit builds.
|
||||
-// This instantiation will never be used in 32-bit builds, and will cause
|
||||
-// warnings when sizeof(Size_T) > sizeof(size_t).
|
||||
-#if SIZE_MAX > UINT32_MAX
|
||||
-template class llvm::SmallVectorBase<uint64_t>;
|
||||
-
|
||||
-// Assertions to ensure this #if stays in sync with SmallVectorSizeType.
|
||||
-static_assert(sizeof(SmallVectorSizeType<char>) == sizeof(uint64_t),
|
||||
- "Expected SmallVectorBase<uint64_t> variant to be in use.");
|
||||
-#else
|
||||
-static_assert(sizeof(SmallVectorSizeType<char>) == sizeof(uint32_t),
|
||||
- "Expected SmallVectorBase<uint32_t> variant to be in use.");
|
||||
-#endif
|
||||
Reference in New Issue
Block a user