Author: Chelsea Cassanova Date: 2024-06-26T15:21:36-07:00 New Revision: 00dcd9a85ca77ee5e19fa90353b8bab361de983e
URL: https://github.com/llvm/llvm-project/commit/00dcd9a85ca77ee5e19fa90353b8bab361de983e DIFF: https://github.com/llvm/llvm-project/commit/00dcd9a85ca77ee5e19fa90353b8bab361de983e.diff LOG: Revert "[ADT] Always use 32-bit size type for SmallVector with 16-bit element…" This reverts commit 2582d11f1a8a5783828156d3ced354727f422885. Added: Modified: llvm/include/llvm/ADT/SmallVector.h llvm/lib/Support/SmallVector.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h index db34b16ecf9e7..09676d792dfeb 100644 --- a/llvm/include/llvm/ADT/SmallVector.h +++ b/llvm/include/llvm/ADT/SmallVector.h @@ -116,7 +116,8 @@ template <class Size_T> class SmallVectorBase { template <class T> using SmallVectorSizeType = - std::conditional_t<sizeof(T) == 1, size_t, uint32_t>; + 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 { diff --git a/llvm/lib/Support/SmallVector.cpp b/llvm/lib/Support/SmallVector.cpp index e77b747984173..b6ce37842040b 100644 --- a/llvm/lib/Support/SmallVector.cpp +++ b/llvm/lib/Support/SmallVector.cpp @@ -37,7 +37,9 @@ struct Struct32B { #pragma GCC diagnostic pop #endif } - +static_assert(sizeof(SmallVector<void *, 0>) == + sizeof(unsigned) * 2 + sizeof(void *), + "wasted space in SmallVector size 0"); static_assert(alignof(SmallVector<Struct16B, 0>) >= alignof(Struct16B), "wrong alignment for 16-byte aligned T"); static_assert(alignof(SmallVector<Struct32B, 0>) >= alignof(Struct32B), @@ -46,19 +48,13 @@ static_assert(sizeof(SmallVector<Struct16B, 0>) >= alignof(Struct16B), "missing padding for 16-byte aligned T"); static_assert(sizeof(SmallVector<Struct32B, 0>) >= alignof(Struct32B), "missing padding for 32-byte aligned T"); - -static_assert(sizeof(SmallVector<void *, 0>) == - sizeof(unsigned) * 2 + sizeof(void *), - "wasted space in SmallVector size 0"); 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"); -static_assert(sizeof(SmallVector<int16_t, 0>) == - sizeof(unsigned) * 2 + sizeof(void *), - "2 byte elements have 32-bit 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. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
