Author: Daniel Thornburgh Date: 2024-09-10T14:07:49-07:00 New Revision: 72cfc74a7c5cea78b174b668f6accaa955742a51
URL: https://github.com/llvm/llvm-project/commit/72cfc74a7c5cea78b174b668f6accaa955742a51 DIFF: https://github.com/llvm/llvm-project/commit/72cfc74a7c5cea78b174b668f6accaa955742a51.diff LOG: Revert "[libc++][string] Remove potential non-trailing 0-length array (#105865)" This reverts commit ed0da008258a3a7df14caa906e23e660174d2507. Added: Modified: libcxx/include/string Removed: ################################################################################ diff --git a/libcxx/include/string b/libcxx/include/string index aba79a74912f5e..3480b57375c118 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -749,14 +749,6 @@ struct __can_be_converted_to_string_view struct __uninitialized_size_tag {}; struct __init_with_sentinel_tag {}; -template <size_t _PaddingSize> -struct __padding { - char __padding_[_PaddingSize]; -}; - -template <> -struct __padding<0> {}; - template <class _CharT, class _Traits, class _Allocator> class basic_string { private: @@ -861,7 +853,7 @@ private: struct __short { value_type __data_[__min_cap]; - _LIBCPP_NO_UNIQUE_ADDRESS __padding<sizeof(value_type) - 1> __padding_; + unsigned char __padding_[sizeof(value_type) - 1]; unsigned char __size_ : 7; unsigned char __is_long_ : 1; }; @@ -913,7 +905,7 @@ private: unsigned char __is_long_ : 1; unsigned char __size_ : 7; }; - _LIBCPP_NO_UNIQUE_ADDRESS __padding<sizeof(value_type) - 1> __padding_; + char __padding_[sizeof(value_type) - 1]; value_type __data_[__min_cap]; }; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
