fixup! remove new compressed_pair layout for now

Author: Michael137

lldb/packages/Python/lldbsuite/test/make/libcxx-simulators-common/compressed_pair.h

@@ -6,7 +6,7 @@
 namespace std {
 namespace __lldb {
 
-#if COMPRESSED_PAIR_REV == 0 // Post-c88580c layout
+// Post-c88580c layout
 struct __value_init_tag {};
 struct __default_init_tag {};
 
@@ -51,38 +51,6 @@ class __compressed_pair : private __compressed_pair_elem<_T1, 0>,
 
   _T1 &first() { return static_cast<_Base1 &>(*this).__get(); }
 };
-#elif COMPRESSED_PAIR_REV == 1
-template <class _ToPad> class __compressed_pair_padding {
-  char __padding_[(is_empty<_ToPad>::value && !__libcpp_is_final<_ToPad>::value)
-                      ? 0
-                      : sizeof(_ToPad) - __datasizeof(_ToPad)];
-};
-
-#define _LLDB_COMPRESSED_PAIR(T1, Initializer1, T2, Initializer2)              \
-  [[__gnu__::__aligned__(alignof(T2))]] [[no_unique_address]] T1 Initializer1; \
-  [[no_unique_address]] __compressed_pair_padding<T1> __padding1_;             \
-  [[no_unique_address]] T2 Initializer2;                                       \
-  [[no_unique_address]] __compressed_pair_padding<T2> __padding2_;
-
-#define _LLDB_COMPRESSED_TRIPLE(T1, Initializer1, T2, Initializer2, T3,        \
-                                Initializer3)                                  \
-  [[using __gnu__: __aligned__(alignof(T2)),                                   \
-    __aligned__(alignof(T3))]] [[no_unique_address]] T1 Initializer1;          \
-  [[no_unique_address]] __compressed_pair_padding<T1> __padding1_;             \
-  [[no_unique_address]] T2 Initializer2;                                       \
-  [[no_unique_address]] __compressed_pair_padding<T2> __padding2_;             \
-  [[no_unique_address]] T3 Initializer3;                                       \
-  [[no_unique_address]] __compressed_pair_padding<T3> __padding3_;
-#elif COMPRESSED_PAIR_REV == 2
-#define _LLDB_COMPRESSED_PAIR(T1, Name1, T2, Name2)                            \
-  [[no_unique_address]] T1 Name1;                                              \
-  [[no_unique_address]] T2 Name2
-
-#define _LLDB_COMPRESSED_TRIPLE(T1, Name1, T2, Name2, T3, Name3)               \
-  [[no_unique_address]] T1 Name1;                                              \
-  [[no_unique_address]] T2 Name2;                                              \
-  [[no_unique_address]] T3 Name3
-#endif
 } // namespace __lldb
 } // namespace std
 

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/unique_ptr/TestDataFormatterLibcxxUniquePtrSimulator.py

@@ -7,29 +7,18 @@
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
-import functools
 
 
 class LibcxxUniquePtrDataFormatterSimulatorTestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
-    def _run_test(self, defines):
-        cxxflags_extras = " ".join(["-D%s" % d for d in defines])
-        self.build(dictionary=dict(CXXFLAGS_EXTRAS=cxxflags_extras))
+    def test(self):
+        self.build()
         lldbutil.run_to_source_breakpoint(
-            self, "// Break here", lldb.SBFileSpec("main.cpp")
+            self, "Break here", lldb.SBFileSpec("main.cpp")
         )
         self.expect("frame variable var_up", substrs=["pointer ="])
         self.expect("frame variable var_up", substrs=["deleter ="], matching=False)
         self.expect(
             "frame variable var_with_deleter_up", substrs=["pointer =", "deleter ="]
         )
-
-
-for r in range(3):
-    name = "test_r%d" % r
-    defines = ["COMPRESSED_PAIR_REV=%d" % r]
-    f = functools.partialmethod(
-        LibcxxUniquePtrDataFormatterSimulatorTestCase._run_test, defines
-    )
-    setattr(LibcxxUniquePtrDataFormatterSimulatorTestCase, name, f)

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/unique_ptr/main.cpp

@@ -14,14 +14,9 @@ template <class _Tp, class _Dp = default_delete<_Tp>> class unique_ptr {
   typedef _Dp deleter_type;
   typedef _Tp *pointer;
 
-#if COMPRESSED_PAIR_REV == 0
   std::__lldb::__compressed_pair<pointer, deleter_type> __ptr_;
   explicit unique_ptr(pointer __p) noexcept
       : __ptr_(__p, std::__lldb::__value_init_tag()) {}
-#elif COMPRESSED_PAIR_REV == 1 || COMPRESSED_PAIR_REV == 2
-  _LLDB_COMPRESSED_PAIR(pointer, __ptr_, deleter_type, __deleter_);
-  explicit unique_ptr(pointer __p) noexcept : __ptr_(__p), __deleter_() {}
-#endif
 };
 } // namespace __lldb
 } // namespace std
@@ -37,5 +32,6 @@ struct StatefulDeleter {
 int main() {
   std::__lldb::unique_ptr<int> var_up(new int(5));
   std::__lldb::unique_ptr<int, StatefulDeleter> var_with_deleter_up(new int(5));
-  return 0; // Break here
+  __builtin_printf("Break here\n");
+  return 0;
 }