at.pass.cpp works in cpp26 for some reason

Author: vinay-deshmukh

libcxx/include/stdexcept

@@ -161,8 +161,8 @@ public:
 
 class _LIBCPP_EXPORTED_FROM_ABI out_of_range : public logic_error {
 public:
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit out_of_range(const string& __s) : logic_error(__s) {}
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit out_of_range(const char* __s) : logic_error(__s) {}
+  _LIBCPP_HIDE_FROM_ABI explicit out_of_range(const string& __s) : logic_error(__s) {}
+  _LIBCPP_HIDE_FROM_ABI explicit out_of_range(const char* __s) : logic_error(__s) {}
 
 #  ifndef _LIBCPP_ABI_VCRUNTIME
   _LIBCPP_HIDE_FROM_ABI out_of_range(const out_of_range&) _NOEXCEPT            = default;
@@ -246,7 +246,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #  endif
 }
 
-[[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __throw_out_of_range(const char* __msg) {
+[[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_out_of_range(const char* __msg) {
 #  if _LIBCPP_HAS_EXCEPTIONS
   throw out_of_range(__msg);
 #  else

libcxx/test/std/containers/associative/map/map.access/at.pass.cpp

@@ -89,8 +89,8 @@ TEST_CONSTEXPR_CXX26 bool test() {
     assert(m.at(8) == 8.5);
     assert(m.size() == 7);
   }
-// #if TEST_STD_VER >= 11
-#ifdef VINAY_DISABLE_FOR_NOW
+#if TEST_STD_VER >= 11
+// #ifdef VINAY_DISABLE_FOR_NOW
   {
     typedef std::pair<const int, double> V;
     V ar[] = {
@@ -111,13 +111,14 @@ TEST_CONSTEXPR_CXX26 bool test() {
     static_assert(std::is_base_of_v<Base, Derived>);
 
 
-    using BaseP = min_pointer<Base>;
-    using DerivedP = min_pointer<Derived>;
+    // using BaseP = min_pointer<Base>;
+    // using DerivedP = min_pointer<Derived>;
     // static_assert(std::is_base_of_v<BaseP, DerivedP>);
-    DerivedP dp(nullptr);
+    // DerivedP dp(nullptr);
+    // (void)dp;
 
-    BaseP bp =static_cast<BaseP>(dp); 
-    (void)bp;
+    // BaseP bp =static_cast<BaseP>(dp); 
+    // (void)bp;
 
 
 
@@ -131,11 +132,15 @@ TEST_CONSTEXPR_CXX26 bool test() {
     assert(m.at(4) == 4.5);
     assert(m.at(5) == 5.5);
 #  ifndef TEST_HAS_NO_EXCEPTIONS
+
+// throwing is not allowed in constexpr
+#   if TEST_STD_VER < 26
     try {
       TEST_IGNORE_NODISCARD m.at(6);
       assert(false);
     } catch (std::out_of_range&) {
     }
+#   endif
 #  endif
     assert(m.at(7) == 7.5);
     assert(m.at(8) == 8.5);
@@ -160,11 +165,14 @@ TEST_CONSTEXPR_CXX26 bool test() {
     assert(m.at(4) == 4.5);
     assert(m.at(5) == 5.5);
 #  ifndef TEST_HAS_NO_EXCEPTIONS
+// throwing is not allowed in constexpr
+#   if TEST_STD_VER < 26
     try {
       TEST_IGNORE_NODISCARD m.at(6);
       assert(false);
     } catch (std::out_of_range&) {
     }
+#   endif
 #  endif
     assert(m.at(7) == 7.5);
     assert(m.at(8) == 8.5);

libcxx/test/std/containers/associative/map/map.access/index_key.pass.cpp

@@ -81,6 +81,8 @@ TEST_CONSTEXPR_CXX26 bool test() {
     using Key               = Container::key_type;
     using MappedType        = Container::mapped_type;
     ConstructController* cc = getConstructController();
+    ConstructController ci;
+    ConstructController* cc = &ci;
     cc->reset();
     {
       Container c;