Tolerate [[nodiscard]] annotations in the STL. Reviewed as https://reviews.llvm.org/D39033

llvm-svn: 318276

58 files changed, 98 insertions, 74 deletions

diff --git a/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
index 1fa8c4a70bd..5649c57f25b 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
@@ -30,10 +30,10 @@ int main()
 {
     {
     typedef std::map<int, double, transparent_less> M;
-    M().count(C2Int{5});
+    assert(M().count(C2Int{5}) == 0);
     }
     {
     typedef std::map<int, double, transparent_less_not_referenceable> M;
-    M().count(C2Int{5});
+    assert(M().count(C2Int{5}) == 0);
     }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp
index bd0bf2ec4a0..5ad176142cf 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_no_type> M;
 
-    M().count(C2Int{5});
+    (void)M().count(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp
index ff4bed8cb60..bb1c32e0e48 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_private> M;
 
-    M().count(C2Int{5});
+    (void)M().count(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp
index 55a463ed38a..8964384de52 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
-    M().count(C2Int{5});
+    (void)M().count(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
index c254fb6a7db..310db6d8937 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
@@ -30,10 +30,16 @@ int main()
 {
     {
     typedef std::map<int, double, transparent_less> M;
-    M().equal_range(C2Int{5});
+    typedef std::pair<typename M::iterator, typename M::iterator> P;
+    M example;
+    P result = example.equal_range(C2Int{5});
+    assert(result.first == result.second);
     }
     {
     typedef std::map<int, double, transparent_less_not_referenceable> M;
-    M().equal_range(C2Int{5});
+    typedef std::pair<typename M::iterator, typename M::iterator> P;
+    M example;
+    P result = example.equal_range(C2Int{5});
+    assert(result.first == result.second);
     }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp
index a92ad96921c..381c2755a08 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_no_type> M;
 
-    M().equal_range(C2Int{5});
+    (void)M().equal_range(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp
index 23357e26897..adf4a4727c2 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_private> M;
 
-    M().equal_range(C2Int{5});
+    (void)M().equal_range(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp
index 3ffa3f22a61..88b62a0b16d 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
-    M().equal_range(C2Int{5});
+    (void)M().equal_range(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp
index 76fe9242a47..a11acb10374 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/find0.pass.cpp
@@ -30,10 +30,12 @@ int main()
 {
     {
     typedef std::map<int, double, transparent_less> M;
-    M().find(C2Int{5});
+    M example;
+    assert(example.find(C2Int{5}) == example.end());
     }
     {
     typedef std::map<int, double, transparent_less_not_referenceable> M;
-    M().find(C2Int{5});
+    M example;
+    assert(example.find(C2Int{5}) == example.end());
     }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp
index 5346821b42a..ca4ec43361a 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_no_type> M;
 
-    M().find(C2Int{5});
+    (void)M().find(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp
index 1dfb7fa44b0..cf8db60e8f3 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_private> M;
 
-    M().find(C2Int{5});
+    (void)M().find(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp
index f5e92b8264b..79a4ae0d9ca 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
-    M().find(C2Int{5});
+    (void)M().find(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp
index de7a545b649..2936da3cb44 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound0.pass.cpp
@@ -30,10 +30,12 @@ int main()
 {
     {
     typedef std::map<int, double, transparent_less> M;
-    M().lower_bound(C2Int{5});
+    M example;
+    assert(example.lower_bound(C2Int{5}) == example.end());
     }
     {
     typedef std::map<int, double, transparent_less_not_referenceable> M;
-    M().lower_bound(C2Int{5});
+    M example;
+    assert(example.lower_bound(C2Int{5}) == example.end());
     }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp
index 6a3ed96a4fc..06468474fd4 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_no_type> M;
 
-    M().lower_bound(C2Int{5});
+    (void)M().lower_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp
index 87fffe7afcc..f6030071283 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_private> M;
 
-    M().lower_bound(C2Int{5});
+    (void)M().lower_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp
index fbccd3ab221..40fb5ff5a24 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
-    M().lower_bound(C2Int{5});
+    (void)M().lower_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp
index 94508d284fd..fa97a714486 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound0.pass.cpp
@@ -30,10 +30,12 @@ int main()
 {
     {
     typedef std::map<int, double, transparent_less> M;
-    M().upper_bound(C2Int{5});
+    M example;
+    assert(example.upper_bound(C2Int{5}) == example.end());
     }
     {
     typedef std::map<int, double, transparent_less_not_referenceable> M;
-    M().upper_bound(C2Int{5});
+    M example;
+    assert(example.upper_bound(C2Int{5}) == example.end());
     }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp
index cb23588e2b9..2badd9957b1 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_no_type> M;
 
-    M().upper_bound(C2Int{5});
+    (void)M().upper_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp
index 1fa4cbc7001..9a6e2be850a 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_private> M;
 
-    M().upper_bound(C2Int{5});
+    (void)M().upper_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp
index 0f3cea23829..f7a7dcd540e 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
-    M().upper_bound(C2Int{5});
+    (void)M().upper_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
index 289d405739a..db84dcf7b29 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
@@ -30,10 +30,10 @@ int main()
 {
     {
     typedef std::multimap<int, double, transparent_less> M;
-    M().count(C2Int{5});
+    assert(M().count(C2Int{5}) == 0);
     }
     {
     typedef std::multimap<int, double, transparent_less_not_referenceable> M;
-    M().count(C2Int{5});
+    assert(M().count(C2Int{5}) == 0);
     }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp
index 70464b12c74..bb15f67f971 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp
@@ -33,6 +33,6 @@ int main()
 {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
-    M().count(C2Int{5});
+    (void)M().count(C2Int{5});
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp
index ad15ff441d7..779af381835 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp
@@ -33,6 +33,6 @@ int main()
 {
     typedef std::multimap<int, double, transparent_less_private> M;
 
-    M().count(C2Int{5});
+    (void)M().count(C2Int{5});
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp
index 5e6c9ab6f96..6fb1f4dfbf9 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp
@@ -33,6 +33,6 @@ int main()
 {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
-    M().count(C2Int{5});
+    (void)M().count(C2Int{5});
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
index 8cdd3c03372..0c093898d13 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
@@ -30,10 +30,16 @@ int main()
 {
     {
     typedef std::multimap<int, double, transparent_less> M;
-    M().equal_range(C2Int{5});
+    typedef std::pair<typename M::iterator, typename M::iterator> P;
+    M example;
+    P result = example.equal_range(C2Int{5});
+    assert(result.first == result.second);
     }
     {
     typedef std::multimap<int, double, transparent_less_not_referenceable> M;
-    M().equal_range(C2Int{5});
+    typedef std::pair<typename M::iterator, typename M::iterator> P;
+    M example;
+    P result = example.equal_range(C2Int{5});
+    assert(result.first == result.second);
     }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp
index a339467f739..20c30fe40a4 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp
@@ -33,6 +33,6 @@ int main()
 {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
-    M().equal_range(C2Int{5});
+    (void)M().equal_range(C2Int{5});
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp
index 633e0615bef..a36fc1f5413 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_private> M;
 
-    M().equal_range(C2Int{5});
+    (void)M().equal_range(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp
index 34b1b4b77fb..a2497761f1f 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
-    M().equal_range(C2Int{5});
+    (void)M().equal_range(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find0.pass.cpp
index a06ec4d702d..0cff61131a0 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find0.pass.cpp
@@ -30,10 +30,12 @@ int main()
 {
     {
     typedef std::multimap<int, double, transparent_less> M;
-    M().find(C2Int{5});
+    M example;
+    assert(example.find(C2Int{5}) == example.end());
     }
     {
     typedef std::multimap<int, double, transparent_less_not_referenceable> M;
-    M().find(C2Int{5});
+    M example;
+    assert(example.find(C2Int{5}) == example.end());
     }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp
index bc3593292be..3df826797c4 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
-    M().find(C2Int{5});
+    (void)M().find(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp
index 254f524afd5..32435f98c1a 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_private> M;
 
-    M().find(C2Int{5});
+    (void)M().find(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp
index 2805f47598f..011c61c5455 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
-    M().find(C2Int{5});
+    (void)M().find(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound0.pass.cpp
index 1000aa772b3..4a882af4ee0 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound0.pass.cpp
@@ -30,10 +30,12 @@ int main()
 {
     {
     typedef std::multimap<int, double, transparent_less> M;
-    M().lower_bound(C2Int{5});
+    M example;
+    assert(example.lower_bound(C2Int{5}) == example.end());
     }
     {
     typedef std::multimap<int, double, transparent_less_not_referenceable> M;
-    M().lower_bound(C2Int{5});
+    M example;
+    assert(example.lower_bound(C2Int{5}) == example.end());
     }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp
index 4b0db47872a..df8cb3844c6 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
-    M().lower_bound(C2Int{5});
+    (void)M().lower_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp
index 300364cffa2..9c7fdcdcbc9 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_private> M;
 
-    M().lower_bound(C2Int{5});
+    (void)M().lower_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp
index 09963096fdf..34eeddc0158 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
-    M().lower_bound(C2Int{5});
+    (void)M().lower_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound0.pass.cpp
index 1a572e9c507..d7618141fe1 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound0.pass.cpp
@@ -30,10 +30,12 @@ int main()
 {
     {
     typedef std::multimap<int, double, transparent_less> M;
-    M().upper_bound(C2Int{5});
+    M example;
+    assert(example.upper_bound(C2Int{5}) == example.end());
     }
     {
     typedef std::multimap<int, double, transparent_less_not_referenceable> M;
-    M().upper_bound(C2Int{5});
+    M example;
+    assert(example.upper_bound(C2Int{5}) == example.end());
     }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp
index 10e59c5e580..67a26a21397 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
-    M().upper_bound(C2Int{5});
+    (void)M().upper_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp
index 81ebbb832c0..35e79da517b 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_private> M;
 
-    M().upper_bound(C2Int{5});
+    (void)M().upper_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp
index fe41315247e..eb3edb6a6e0 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp
@@ -34,7 +34,7 @@ int main()
     {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
-    M().upper_bound(C2Int{5});
+    (void)M().upper_bound(C2Int{5});
     }
 }
 #endif
diff --git a/libcxx/test/std/iterators/iterators.general/gcc_workaround.pass.cpp b/libcxx/test/std/iterators/iterators.general/gcc_workaround.pass.cpp
index 6522bd3c7bc..28a5e95f3ed 100644
--- a/libcxx/test/std/iterators/iterators.general/gcc_workaround.pass.cpp
+++ b/libcxx/test/std/iterators/iterators.general/gcc_workaround.pass.cpp
@@ -11,10 +11,10 @@
 
 #include <string>
 
-void f(const std::string &s) { s.begin(); }
+void f(const std::string &s) { (void)s.begin(); }
 
 #include <vector>
 
-void AppendTo(const std::vector<char> &v) { v.begin(); }
+void AppendTo(const std::vector<char> &v) { (void)v.begin(); }
 
 int main() {}
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
index d2ad79af66f..71b0eaca737 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/make_move_iterator.pass.cpp
@@ -43,8 +43,8 @@ int main()
     }
     {
     int a[] = {1,2,3,4};
-    std::make_move_iterator(a+4);
-    std::make_move_iterator(a); // test for LWG issue 2061
+    (void)std::make_move_iterator(a+4);
+    (void)std::make_move_iterator(a); // test for LWG issue 2061
     }
 
 #if TEST_STD_VER > 14
diff --git a/libcxx/test/std/strings/basic.string/string.access/at.pass.cpp b/libcxx/test/std/strings/basic.string/string.access/at.pass.cpp
index 891648930e3..8bfb829b0c0 100644
--- a/libcxx/test/std/strings/basic.string/string.access/at.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.access/at.pass.cpp
@@ -35,7 +35,7 @@ test(S s, typename S::size_type pos)
     {
         try
         {
-            s.at(pos);
+            (void)s.at(pos);
             assert(false);
         }
         catch (std::out_of_range&)
@@ -44,7 +44,7 @@ test(S s, typename S::size_type pos)
         }
         try
         {
-            cs.at(pos);
+            (void)cs.at(pos);
             assert(false);
         }
         catch (std::out_of_range&)
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_T_size_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_T_size_size.pass.cpp
index bc2bf656db0..6ca473f566c 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_T_size_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_T_size_size.pass.cpp
@@ -45,7 +45,7 @@ test(const S& s, typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, sv, pos2, n2);
+            (void)s.compare(pos1, n1, sv, pos2, n2);
             assert(false);
         }
         catch (const std::out_of_range&)
@@ -69,7 +69,7 @@ test_npos(const S& s, typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, sv, pos2);
+            (void)s.compare(pos1, n1, sv, pos2);
             assert(false);
         }
         catch (const std::out_of_range&)
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
index 13f6c5a1cd7..0f58fdcace6 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer.pass.cpp
@@ -40,7 +40,7 @@ test(const S& s, typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, str);
+            (void)s.compare(pos1, n1, str);
             assert(false);
         }
         catch (std::out_of_range&)
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
index fc811c84671..5761b7513b7 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_pointer_size.pass.cpp
@@ -40,7 +40,7 @@ test(const S& s, typename S::size_type pos, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos, n1, str, n2);
+            (void)s.compare(pos, n1, str, n2);
             assert(false);
         }
         catch (std::out_of_range&)
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
index b3d7da29fb1..c543e733756 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string.pass.cpp
@@ -40,7 +40,7 @@ test(const S& s, typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, str);
+            (void)s.compare(pos1, n1, str);
             assert(false);
         }
         catch (std::out_of_range&)
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
index 42bba9d5eb2..6e638134813 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_size_size.pass.cpp
@@ -42,7 +42,7 @@ test(const S& s,   typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, str, pos2, n2);
+            (void)s.compare(pos1, n1, str, pos2, n2);
             assert(false);
         }
         catch (const std::out_of_range&)
@@ -65,7 +65,7 @@ test_npos(const S& s,   typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, str, pos2);
+            (void)s.compare(pos1, n1, str, pos2);
             assert(false);
         }
         catch (const std::out_of_range&)
diff --git a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_view.pass.cpp
index 6a5ba22cdc8..1e025c70e10 100644
--- a/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_view.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.ops/string_compare/size_size_string_view.pass.cpp
@@ -40,7 +40,7 @@ test(const S& s, typename S::size_type pos1, typename S::size_type n1,
     {
         try
         {
-            s.compare(pos1, n1, sv);
+            (void)s.compare(pos1, n1, sv);
             assert(false);
         }
         catch (std::out_of_range&)
diff --git a/libcxx/test/std/strings/string.view/string.view.access/at.pass.cpp b/libcxx/test/std/strings/string.view/string.view.access/at.pass.cpp
index 6df879898f4..7d5cf241e66 100644
--- a/libcxx/test/std/strings/string.view/string.view.access/at.pass.cpp
+++ b/libcxx/test/std/strings/string.view/string.view.access/at.pass.cpp
@@ -32,7 +32,7 @@ void test ( const CharT *s, size_t len ) {
     }
 
 #ifndef TEST_HAS_NO_EXCEPTIONS
-    try { sv.at(len); } catch ( const std::out_of_range & ) { return ; }
+    try { (void)sv.at(len); } catch ( const std::out_of_range & ) { return ; }
     assert ( false );
 #endif
 }
diff --git a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
index 5a4a3c3c189..d98b8d68b21 100644
--- a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
+++ b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
@@ -115,14 +115,14 @@ void test_make_any_throws()
 {
     {
         try {
-            std::make_any<Type>(101);
+            (void)std::make_any<Type>(101);
             assert(false);
         } catch (int const&) {
         }
     }
     {
         try {
-            std::make_any<Type>({1, 2, 3}, 101);
+            (void)std::make_any<Type>({1, 2, 3}, 101);
             assert(false);
         } catch (int const&) {
         }
diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
index 117dd979fdd..73cf073362f 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.ownerless/owner_less.pass.cpp
@@ -126,7 +126,7 @@ int main()
     // test heterogeneous lookups
     std::set<std::shared_ptr<X>, std::owner_less<>> s;
     std::shared_ptr<void> vp;
-    s.find(vp);
+    assert(s.find(vp) == s.end());
     }
 #endif
 }
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
index 44e6e730590..bbc70014f09 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
@@ -69,7 +69,7 @@ int main()
         optional<X> opt;
         try
         {
-            opt.value();
+            (void)opt.value();
             assert(false);
         }
         catch (const bad_optional_access&)
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
index e2d48ec9930..c644fb9d669 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
@@ -61,7 +61,7 @@ int main()
         const optional<X> opt;
         try
         {
-            opt.value();
+            (void)opt.value();
             assert(false);
         }
         catch (const bad_optional_access&)
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
index 874a5441a4c..5347d3f558b 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
@@ -61,7 +61,7 @@ int main()
         const optional<X> opt;
         try
         {
-            std::move(opt).value();
+            (void)std::move(opt).value();
             assert(false);
         }
         catch (const bad_optional_access&)
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
index 60cab7d27c6..1a577e68b99 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
@@ -67,7 +67,7 @@ int main()
         optional<X> opt;
         try
         {
-            std::move(opt).value();
+            (void)std::move(opt).value();
             assert(false);
         }
         catch (const bad_optional_access&)
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
index 4f04f4a399d..0ec65309dbb 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
@@ -259,7 +259,7 @@ void test_throws_for_all_value_categories() {
   auto test = [](auto idx, auto &&v) {
     using Idx = decltype(idx);
     try {
-      std::get<Idx::value>(std::forward<decltype(v)>(v));
+      (void)std::get<Idx::value>(std::forward<decltype(v)>(v));
     } catch (const std::bad_variant_access &) {
       return true;
     } catch (...) { /* ... */
diff --git a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
index 63221f69c8f..5d9213ed0a5 100644
--- a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
@@ -259,7 +259,7 @@ void test_throws_for_all_value_categories() {
   auto test = [](auto idx, auto &&v) {
     using Idx = decltype(idx);
     try {
-      std::get<typename Idx::type>(std::forward<decltype(v)>(v));
+      (void)std::get<typename Idx::type>(std::forward<decltype(v)>(v));
     } catch (const std::bad_variant_access &) {
       return true;
     } catch (...) { /* ... */