breaks correctly

Author: vinay-deshmukh

libcxx/include/__tree

@@ -1034,7 +1034,9 @@ public:
     // fails here for move_alloc.pass.cpp
 
     #if _LIBCPP_STD_VER >= 26
-    if (__libcpp_is_constant_evaluated()) {
+    if constexpr (
+        integral_constant<bool, is_copy_constructible<decltype(__value.first)>::value >()
+    ) {
       // static_assert(std::same_as_v<decltype(__value.first), double>);
       // __emplace_hint_unique(__p, std::move(__value.first), std::move(__value.second));
 
@@ -1272,13 +1274,13 @@ private:
 error: no matching constructor for initialization of '__get_node_value_type_t<value_type>' (aka 'std::pair<const MoveOnly, MoveOnly>')
 # |  1225 |       __get_node_value_type_t<value_type> __tmp(__rhs.first, __rhs.second);
      */
-    if (__libcpp_is_constant_evaluated()) {
+    if constexpr (integral_constant<bool, is_copy_constructible_v<_From> >()) {
       // __move_from_value_type(__lhs, __rhs
       // , integral_constant<bool, is_copy_constructible_v<_From> >()
       // );
 
       // TODO: narrow it to "_From.first"
-      if constexpr (integral_constant<bool, is_copy_constructible_v<_From> >()) {
+      // if constexpr (integral_constant<bool, is_copy_constructible_v<_From> >()) {
         // we use copy, and not "move" as the constraint
         // because we can NOT move from `const key_type`, which is how `value_type` is defined
         // atleast for map
@@ -1301,15 +1303,15 @@ error: no matching constructor for initialization of '__get_node_value_type_t<va
       __node_traits::construct(__na, std::addressof(__lhs), std::move(__tmp));
 
 
-      } else {
+      // } else {
 
       // (void)__lhs;
       // (void)__rhs;
-      static_assert(false, "Can not move from a pair<const T, U>");
+      // static_assert(false, "Can not move from a pair<const T, U>");
       // TODO: how do I flag this code to NOT run at compile time?
       // Using static_assert means this can't compile _at all_, regardless of whether this code is actually going to execute at compile time or not
 
-      }
+      // }
 
 
 

libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp

@@ -157,7 +157,7 @@ int main(int, char**) {
   assert(test());
 #if TEST_STD_VER >= 26
 // FIXME: Within __tree, it is not allowed to move from a `const MoveOnly` which prevents this from executing during constant evaluation
-//  static_assert(test());
+ static_assert(test());
 #endif
   return 0;
 }

libcxx/test/std/containers/associative/map/map.cons/move_assign.pass.cpp

@@ -23,7 +23,7 @@
 #include "test_allocator.h"
 #include "min_allocator.h"
 
-// TEST_CONSTEXPR_CXX26
+TEST_CONSTEXPR_CXX26
  bool test() {
   {
     typedef std::pair<MoveOnly, MoveOnly> V;
@@ -104,7 +104,7 @@ int main(int, char**) {
   assert(test());
 #if TEST_STD_VER >= 26
 // FIXME: Within __tree, it is not allowed to move from a `const MoveOnly` which prevents this from executing during constant evaluation
-//  static_assert(test());
+ static_assert(test());
 #endif
   return 0;
 }