From 37ff51a98583e63fb9afe83cf9f4351760149028 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 1 Sep 2022 11:52:52 +0100
Subject: [PATCH] libstdc++: Remove FIXME for ICE with remove_cvref_t in
 requires-expression

PR c++/99968 is fixed since GCC 12.1 so we can remove the workaround.

libstdc++-v3/ChangeLog:

	* include/std/type_traits (is_scoped_enum): Remove workaround.
---
 libstdc++-v3/include/std/type_traits | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 5984442c0aa8..5b8314f24fd7 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -3534,20 +3534,11 @@ template<typename _Ret, typename _Fn, typename... _Args>
 
   template<typename _Tp>
     requires __is_enum(_Tp)
-    && requires(_Tp __t) { __t = __t; } // fails if incomplete
+    && requires(remove_cv_t<_Tp> __t) { __t = __t; } // fails if incomplete
     struct is_scoped_enum<_Tp>
     : bool_constant<!requires(_Tp __t, void(*__f)(int)) { __f(__t); }>
     { };
 
-  // FIXME remove this partial specialization and use remove_cv_t<_Tp> above
-  // when PR c++/99968 is fixed.
-  template<typename _Tp>
-    requires __is_enum(_Tp)
-    && requires(_Tp __t) { __t = __t; } // fails if incomplete
-    struct is_scoped_enum<const _Tp>
-    : bool_constant<!requires(_Tp __t, void(*__f)(int)) { __f(__t); }>
-    { };
-
   /// @ingroup variable_templates
   /// @since C++23
   template<typename _Tp>
-- 
2.47.2