https://github.com/Michael137 updated
https://github.com/llvm/llvm-project/pull/108375
>From 5b38bd48254d552dca2eb51d7270b01734494d90 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuc...@gmail.com>
Date: Thu, 12 Sep 2024 11:05:27 +0100
Subject: [PATCH 1/3] [lldb][test] TestDataFormatterLibcxxStringSimulator.py:
fix padding for current layout
Drive-by:
* Also run expression evaluator on the string to
provide is with some extra coverage.
---
.../string/TestDataFormatterLibcxxStringSimulator.py | 3 +++
.../data-formatter-stl/libcxx-simulators/string/main.cpp | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
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 3e5c493692c4f0..98d2c7320003e4 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
@@ -22,6 +22,9 @@ def _run_test(self, defines):
self.expect_var_path("shortstring", summary='"short"')
self.expect_var_path("longstring", summary='"I am a very long string"')
+ self.expect_expr("shortstring", result_summary='"short"')
+ self.expect_expr("longstring", result_summary='"I am a very long
string"')
+
for v in [None, "ALTERNATE_LAYOUT"]:
for r in range(5):
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 7beeb9c39de49e..74baeba6ec879b 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
@@ -71,15 +71,15 @@ template <class _CharT, class _Traits, class _Allocator>
class basic_string {
struct __short {
value_type __data_[__min_cap];
-#ifdef BITMASKS
#ifdef SUBCLASS_PADDING
struct : __padding<value_type> {
unsigned char __size_;
};
-#else
+#else // !SUBCLASS_PADDING
+
unsigned char __padding[sizeof(value_type) - 1];
+#ifdef BITMASKS
unsigned char __size_;
-#endif
#else // !BITMASKS
unsigned char __size_ : 7;
unsigned char __is_long_ : 1;
>From 258b6fd43dddeb748cfd7e1dae5496ff156e33fa Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuc...@gmail.com>
Date: Thu, 12 Sep 2024 11:56:50 +0100
Subject: [PATCH 2/3] fixup! add missing endif
---
.../data-formatter-stl/libcxx-simulators/string/main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 74baeba6ec879b..b010dc25f8f804 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
@@ -83,7 +83,8 @@ template <class _CharT, class _Traits, class _Allocator>
class basic_string {
#else // !BITMASKS
unsigned char __size_ : 7;
unsigned char __is_long_ : 1;
-#endif
+#endif // BITMASKS
+#endif // SUBCLASS_PADDING
};
#ifdef BITMASKS
>From 35971a4ee2e62552b57f644a2b1ff57c513a7934 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuc...@gmail.com>
Date: Thu, 12 Sep 2024 12:55:17 +0100
Subject: [PATCH 3/3] [lldb][test] TestDataFormatterLibcxxStringSimulator.py:
add new padding layout
Depends on https://github.com/llvm/llvm-project/pull/108362.
Adds new layout for https://github.com/llvm/llvm-project/pull/105865.
---
.../TestDataFormatterLibcxxStringSimulator.py | 2 +-
.../libcxx-simulators/string/main.cpp | 34 +++++++++++++++----
2 files changed, 29 insertions(+), 7 deletions(-)
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 98d2c7320003e4..dd9f5de22c9057 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):
name = "test_r%d" % r
defines = ["REVISION=%d" % r]
if v:
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 b010dc25f8f804..5cf3a85007fb64 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-TODO layout.
+#define UB_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 UB_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 // !UB_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 UB_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 UB_PADDING
+ unsigned char __padding[sizeof(value_type) - 1];
+#else // !UB_PADDING
+ [[no_unique_address]] __padding<sizeof(value_type) - 1> __padding_;
+#endif // UB_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
