Fix gcc constexpr evaluation failure

Author: winner245

libcxx/include/__memory/pointer_traits.h

@@ -302,14 +302,6 @@ concept __resettable_smart_pointer_with_args = requires(_Smart __s, _Pointer __p
 
 #endif
 
-template <class _PtrTo, class _PtrFrom>
-_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _PtrTo __static_fancy_pointer_cast(const _PtrFrom& __p) {
-  using __ptr_traits   = pointer_traits<_PtrTo>;
-  using __element_type = typename __ptr_traits::element_type;
-  return __p ? __ptr_traits::pointer_to(*static_cast<__element_type*>(std::addressof(*__p)))
-             : static_cast<_PtrTo>(nullptr);
-}
-
 _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS

libcxx/include/list

@@ -344,7 +344,7 @@ public:
 
   _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __base_pointer __as_link() {
     return pointer_traits<__base_pointer>::pointer_to(
-        *static_cast<typename pointer_traits<__base_pointer>::element_type*>(this));
+        *static_cast<typename pointer_traits<__base_pointer>::element_type*>(std::addressof(*this)));
   }
 };
 

libcxx/test/std/containers/sequences/list/list.capacity/resize_size.pass.cpp

@@ -12,7 +12,6 @@
 
 #include <list>
 #include <cassert>
-#include <type_traits>
 
 #include "test_macros.h"
 #include "DefaultOnly.h"
@@ -35,7 +34,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
     assert(l.back() == 0);
   }
 #if TEST_STD_VER >= 11
-  if (!std::is_constant_evaluated()) {
+  if (!TEST_IS_CONSTANT_EVALUATED) {
     {
       std::list<DefaultOnly> l(10);
       l.resize(5);

libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp

@@ -174,7 +174,7 @@ TEST_CONSTEXPR_CXX26 void test_emplacable_concept_with_alloc() {
 #endif
 }
 
-TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc() {
+void test_ctor_under_alloc() {
 #if TEST_STD_VER >= 11
   int arr1[] = {42};
   int arr2[] = {1, 101, 42};
@@ -205,7 +205,7 @@ TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc() {
 #endif
 }
 
-TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc_with_alloc() {
+void test_ctor_under_alloc_with_alloc() {
 #if TEST_STD_VER >= 11
   int arr1[] = {42};
   int arr2[] = {1, 101, 42};

libcxx/test/std/containers/sequences/list/list.cons/size_type.pass.cpp

@@ -13,7 +13,6 @@
 #include <list>
 #include <cassert>
 #include <cstddef>
-#include <type_traits>
 
 #include "test_macros.h"
 #include "DefaultOnly.h"
@@ -88,7 +87,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
     assert(*i == 0);
   }
 
-  if (!std::is_constant_evaluated()) {
+  if (!TEST_IS_CONSTANT_EVALUATED) {
     {
       std::list<DefaultOnly> l(3);
       assert(l.size() == 3);

libcxx/test/support/counting_predicates.h

@@ -28,8 +28,8 @@ struct unary_counting_predicate {
     ++count_;
     return p_(a);
   }
-  TEST_CONSTEXPR std::size_t count() const { return count_; }
-  TEST_CONSTEXPR void reset() { count_ = 0; }
+  TEST_CONSTEXPR_CXX14 std::size_t count() const { return count_; }
+  TEST_CONSTEXPR_CXX14 void reset() { count_ = 0; }
 
 private:
   Predicate p_;
@@ -43,17 +43,17 @@ struct binary_counting_predicate {
   typedef Arg2 second_argument_type;
   typedef bool result_type;
 
-    TEST_CONSTEXPR binary_counting_predicate(Predicate p) : p_(p), count_(0) {}
-    TEST_CONSTEXPR_CXX14 bool operator()(const Arg1& a1, const Arg2& a2) const {
-      ++count_;
-      return p_(a1, a2);
-    }
-    TEST_CONSTEXPR std::size_t count() const { return count_; }
-    TEST_CONSTEXPR_CXX14 void reset() { count_ = 0; }
-
-  private:
-    Predicate p_;
-    mutable std::size_t count_;
+  TEST_CONSTEXPR binary_counting_predicate(Predicate p) : p_(p), count_(0) {}
+  TEST_CONSTEXPR_CXX14 bool operator()(const Arg1& a1, const Arg2& a2) const {
+    ++count_;
+    return p_(a1, a2);
+  }
+  TEST_CONSTEXPR std::size_t count() const { return count_; }
+  TEST_CONSTEXPR_CXX14 void reset() { count_ = 0; }
+
+private:
+  Predicate p_;
+  mutable std::size_t count_;
 };
 
 #if TEST_STD_VER > 14