Author: Michael Buch Date: 2024-10-03T12:53:28+01:00 New Revision: d5f6e886ff0df8265d44ab0646afcb4a06e6475a
URL: https://github.com/llvm/llvm-project/commit/d5f6e886ff0df8265d44ab0646afcb4a06e6475a DIFF: https://github.com/llvm/llvm-project/commit/d5f6e886ff0df8265d44ab0646afcb4a06e6475a.diff LOG: [lldb][test] TestDataFormatterLibcxxStringSimulator.py: add new padding layout (#108375) Depends on https://github.com/llvm/llvm-project/pull/108362 and https://github.com/llvm/llvm-project/pull/108343. Adds new layout for https://github.com/llvm/llvm-project/pull/105865. Added: Modified: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/TestDataFormatterLibcxxStringSimulator.py lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/main.cpp Removed: ################################################################################ diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/TestDataFormatterLibcxxStringSimulator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/TestDataFormatterLibcxxStringSimulator.py index afe6374e55a355..fff181440b6d7c 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/TestDataFormatterLibcxxStringSimulator.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/TestDataFormatterLibcxxStringSimulator.py @@ -27,7 +27,7 @@ def _run_test(self, defines): for v in [None, "ALTERNATE_LAYOUT"]: - for r in range(5): + for r in range(6): for c in range(3): name = "test_r%d_c%d" % (r, c) defines = ["REVISION=%d" % r, "COMPRESSED_PAIR_REV=%d" % c] diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/main.cpp index f8fc13c10c4372..628d32c8d7a55e 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/string/main.cpp @@ -20,7 +20,11 @@ // Pre-D128285 layout. #define PACKED_ANON_STRUCT #endif -// REVISION == 4: current layout +#if REVISION <= 4 +// Pre-2a1ef74 layout. +#define NON_STANDARD_PADDING +#endif +// REVISION == 5: current layout #ifdef PACKED_ANON_STRUCT #define BEGIN_PACKED_ANON_STRUCT struct __attribute__((packed)) { @@ -34,6 +38,7 @@ namespace std { namespace __lldb { +#ifdef NON_STANDARD_PADDING #if defined(ALTERNATE_LAYOUT) && defined(SUBCLASS_PADDING) template <class _CharT, size_t = sizeof(_CharT)> struct __padding { unsigned char __xx[sizeof(_CharT) - 1]; @@ -41,6 +46,13 @@ template <class _CharT, size_t = sizeof(_CharT)> struct __padding { template <class _CharT> struct __padding<_CharT, 1> {}; #endif +#else // !NON_STANDARD_PADDING +template <size_t _PaddingSize> struct __padding { + char __padding_[_PaddingSize]; +}; + +template <> struct __padding<0> {}; +#endif template <class _CharT, class _Traits, class _Allocator> class basic_string { public: @@ -77,7 +89,12 @@ template <class _CharT, class _Traits, class _Allocator> class basic_string { }; #else // !SUBCLASS_PADDING +#ifdef NON_STANDARD_PADDING unsigned char __padding[sizeof(value_type) - 1]; +#else + [[no_unique_address]] __padding<sizeof(value_type) - 1> __padding_; +#endif + #ifdef BITMASKS unsigned char __size_; #else // !BITMASKS @@ -129,21 +146,26 @@ template <class _CharT, class _Traits, class _Allocator> class basic_string { union { #ifdef BITMASKS unsigned char __size_; -#else +#else // !BITMASKS struct { unsigned char __is_long_ : 1; unsigned char __size_ : 7; }; -#endif +#endif // BITMASKS value_type __lx; }; -#else +#else // !SHORT_UNION BEGIN_PACKED_ANON_STRUCT unsigned char __is_long_ : 1; unsigned char __size_ : 7; END_PACKED_ANON_STRUCT - char __padding_[sizeof(value_type) - 1]; -#endif +#ifdef NON_STANDARD_PADDING + unsigned char __padding[sizeof(value_type) - 1]; +#else // !NON_STANDARD_PADDING + [[no_unique_address]] __padding<sizeof(value_type) - 1> __padding_; +#endif // NON_STANDARD_PADDING + +#endif // SHORT_UNION value_type __data_[__min_cap]; }; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
