From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 14 Apr 2020 10:23:34 +0000 (+0100)
Subject: libstdc++: Make comparison category comparisons noexcept (PR 94565)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=597601aa7a0f822816041d521fae7da6e883fa7d;p=gcc.git

libstdc++: Make comparison category comparisons noexcept (PR 94565)

	PR libstdc++/94565
	* libsupc++/compare (__unspec): Add noexcept-specifier to constructor.
	* testsuite/18_support/comparisons/categories/94565.cc: New test.
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5d4c34ada18..aced89eec7d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -3,6 +3,12 @@
 	* include/std/coroutine: Update coroutines builtin define,
 	per n4861.
 
+2020-04-14  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/94565
+	* libsupc++/compare (__unspec): Add noexcept-specifier to constructor.
+	* testsuite/18_support/comparisons/categories/94565.cc: New test.
+
 2020-04-09  Jonathan Wakely  <jwakely@redhat.com>
 
 	* libsupc++/compare (compare_three_way): Fix noexcept-specifier.
diff --git a/libstdc++-v3/libsupc++/compare b/libstdc++-v3/libsupc++/compare
index 37601d32648..5f1df19e445 100644
--- a/libstdc++-v3/libsupc++/compare
+++ b/libstdc++-v3/libsupc++/compare
@@ -56,7 +56,7 @@ namespace std
 
     struct __unspec
     {
-      constexpr __unspec(__unspec*) { }
+      constexpr __unspec(__unspec*) noexcept { }
     };
   }
 
diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc
new file mode 100644
index 00000000000..a4c62466a18
--- /dev/null
+++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/94565.cc
@@ -0,0 +1,66 @@
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do compile { target c++2a } }
+
+#include <compare>
+
+static_assert(noexcept(std::partial_ordering::less == 0));
+static_assert(noexcept(std::partial_ordering::less != 0));
+static_assert(noexcept(std::partial_ordering::less < 0));
+static_assert(noexcept(std::partial_ordering::less > 0));
+static_assert(noexcept(std::partial_ordering::less <= 0));
+static_assert(noexcept(std::partial_ordering::less >= 0));
+static_assert(noexcept(std::partial_ordering::less <=> 0));
+static_assert(noexcept(0 == std::partial_ordering::less));
+static_assert(noexcept(0 != std::partial_ordering::less));
+static_assert(noexcept(0 < std::partial_ordering::less));
+static_assert(noexcept(0 > std::partial_ordering::less));
+static_assert(noexcept(0 <= std::partial_ordering::less));
+static_assert(noexcept(0 >= std::partial_ordering::less));
+static_assert(noexcept(0 <=> std::partial_ordering::less));
+
+static_assert(noexcept(std::weak_ordering::less == 0));
+static_assert(noexcept(std::weak_ordering::less != 0));
+static_assert(noexcept(std::weak_ordering::less < 0));
+static_assert(noexcept(std::weak_ordering::less > 0));
+static_assert(noexcept(std::weak_ordering::less <= 0));
+static_assert(noexcept(std::weak_ordering::less >= 0));
+static_assert(noexcept(std::weak_ordering::less <=> 0));
+static_assert(noexcept(0 == std::weak_ordering::less));
+static_assert(noexcept(0 != std::weak_ordering::less));
+static_assert(noexcept(0 < std::weak_ordering::less));
+static_assert(noexcept(0 > std::weak_ordering::less));
+static_assert(noexcept(0 <= std::weak_ordering::less));
+static_assert(noexcept(0 >= std::weak_ordering::less));
+static_assert(noexcept(0 <=> std::weak_ordering::less));
+
+static_assert(noexcept(std::strong_ordering::less == 0));
+static_assert(noexcept(std::strong_ordering::less != 0));
+static_assert(noexcept(std::strong_ordering::less < 0));
+static_assert(noexcept(std::strong_ordering::less > 0));
+static_assert(noexcept(std::strong_ordering::less <= 0));
+static_assert(noexcept(std::strong_ordering::less >= 0));
+static_assert(noexcept(std::strong_ordering::less <=> 0));
+static_assert(noexcept(0 == std::strong_ordering::less));
+static_assert(noexcept(0 != std::strong_ordering::less));
+static_assert(noexcept(0 < std::strong_ordering::less));
+static_assert(noexcept(0 > std::strong_ordering::less));
+static_assert(noexcept(0 <= std::strong_ordering::less));
+static_assert(noexcept(0 >= std::strong_ordering::less));
+static_assert(noexcept(0 <=> std::strong_ordering::less));