From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 31 Oct 2018 12:58:45 +0000 (+0000)
Subject: More testing for std::pair layout change
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5e33619bf7766bcd1419da6d32780199db8df86;p=gcc.git

More testing for std::pair layout change

	* testsuite/20_util/pair/87822.cc: Test deeper nesting.

From-SVN: r265680
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ac4df1ad515..9fb18de67d7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
 2018-10-31  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/20_util/pair/87822.cc: Test deeper nesting.
+
 	PR libstdc++/87822
 	* include/bits/stl_pair.h (__pair_base): Change to class template.
 	(pair): Make base class type depend on template parameters.
diff --git a/libstdc++-v3/testsuite/20_util/pair/87822.cc b/libstdc++-v3/testsuite/20_util/pair/87822.cc
index cd099d6f9f9..523d583f08a 100644
--- a/libstdc++-v3/testsuite/20_util/pair/87822.cc
+++ b/libstdc++-v3/testsuite/20_util/pair/87822.cc
@@ -26,6 +26,7 @@ test01()
   static_assert(sizeof(p) == (3 * sizeof(int)), "PR libstdc++/87822");
 #endif
   VERIFY( (void*)&p == (void*)&p.first );
+  VERIFY( (void*)&p == (void*)&p.first.first );
 }
 
 struct empty { };
@@ -40,8 +41,24 @@ test02()
   VERIFY( (void*)&p == (void*)&p.first );
 }
 
+void
+test03()
+{
+  typedef std::pair<int, int> int_pair;
+  typedef std::pair<int_pair, int_pair> int_pair_pair;
+  std::pair<int_pair_pair, int_pair_pair> p;
+#if __cplusplus >= 201103L
+  static_assert(sizeof(int_pair_pair) == (2 * sizeof(int_pair)), "nested");
+  static_assert(sizeof(p) == (2 * sizeof(int_pair_pair)), "nested again");
+#endif
+  VERIFY( (void*)&p == (void*)&p.first );
+  VERIFY( (void*)&p == (void*)&p.first.first );
+  VERIFY( (void*)&p == (void*)&p.first.first.first );
+}
+
 int main()
 {
   test01();
   test02();
+  test03();
 }