[libcxx-commits] [PATCH] D109298: [libc++][test] Add tuple trivial destructor test

[Joe Loser via Phabricator via libcxx-commits]

jloser updated this revision to Diff 436156.
jloser marked 2 inline comments as done.
jloser added a comment.

Modify TrackDtor per Mordante's suggestion to make the intent of the test a bit clearer


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D109298/new/

https://reviews.llvm.org/D109298

Files:
  libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp


Index: libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp
===================================================================
--- libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp
+++ libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/dtor.pass.cpp
@@ -25,18 +25,35 @@
 
 #include "test_macros.h"
 
+struct TrackDtor {
+   int* count_;
+   constexpr explicit TrackDtor(int* count) : count_(count) {}
+   constexpr TrackDtor(TrackDtor&& that) : count_(that.count_) { that.count_ = nullptr; }
+   TEST_CONSTEXPR_CXX20 ~TrackDtor() { if(count_) ++*count_; }
+};
+static_assert(!std::is_trivially_destructible<TrackDtor>::value, "");
+
+static_assert(std::is_trivially_destructible<std::tuple<>>::value, "");
+static_assert(std::is_trivially_destructible<std::tuple<void*>>::value, "");
+static_assert(std::is_trivially_destructible<std::tuple<int, float>>::value, "");
+static_assert(!std::is_trivially_destructible<std::tuple<std::string>>::value, "");
+static_assert(!std::is_trivially_destructible<std::tuple<int, std::string>>::value, "");
+
+TEST_CONSTEXPR_CXX20 bool test() {
+  int count = 0;
+  {
+    std::tuple<TrackDtor> tuple{TrackDtor(&count)};
+    assert(count == 0);
+  }
+  assert(count == 1);
+
+  return true;
+}
+
 int main(int, char**)
 {
-  static_assert(std::is_trivially_destructible<
-      std::tuple<> >::value, "");
-  static_assert(std::is_trivially_destructible<
-      std::tuple<void*> >::value, "");
-  static_assert(std::is_trivially_destructible<
-      std::tuple<int, float> >::value, "");
-  static_assert(!std::is_trivially_destructible<
-      std::tuple<std::string> >::value, "");
-  static_assert(!std::is_trivially_destructible<
-      std::tuple<int, std::string> >::value, "");
+  static_assert(test());
+  test();
 
   return 0;
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D109298.436156.patch
Type: text/x-patch
Size: 1820 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220611/2a9d0a4f/attachment-0001.bin>