[libc++][nfc] Use TEST_SAFE_STATIC.

[Mordante]

Summary

This avoids using an libc++ internal macro in our tests.

[ldionne]

libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp

33

It looks like it might be possible to remove the if defined(_LIBCPP_VERSION) now?

Also, I don't quite understand the purpose of the variable itself, but I guess that's an orthogonal question.

[Mordante]

Addresses review comment.

[Mordante]

libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp

33

I haven't looked at what this is exactly used for, I just try to remove the libc++ specific dependencies from the tests.
The attribute enabled is https://clang.llvm.org/docs/AttributeReference.html#require-constant-initialization-constinit-c-20

[• Quuxplusone]

FWIW, I think this PR is fine as-is, but there also seems to be room for a much larger improvement to how we do (and name) _LIBCPP_SAFE_STATIC at all. Meanwhile, the point of these tests is actually to verify that the relevant ctors are constexpr, so having them use any macro that sometimes expands to "nothing" smells like it's losing us test coverage. If I were doing the followup patch (which maybe I am? let me know :)), I'd:

• Rename _LIBCPP_SAFE_STATIC to _LIBCPP_CONSTINIT

-Make _LIBCPP_CONSTINIT expand to constinit in C++20 mode, else __attribute__((__require_constant_initialization__)) if supported, else seriously consider making it a hard error (where right now it expands to nothing).

• Rename TEST_SAFE_STATIC to TEST_CONSTINIT, and make it ​expand to _LIBCPP_CONSTINIT if it's defined, else if C++20 then constinit, else nothing.

[Mordante]

In D118874#3294267, @Quuxplusone wrote:

FWIW, I think this PR is fine as-is, but there also seems to be room for a much larger improvement to how we do (and name) _LIBCPP_SAFE_STATIC at all. Meanwhile, the point of these tests is actually to verify that the relevant ctors are constexpr, so having them use any macro that sometimes expands to "nothing" smells like it's losing us test coverage. If I were doing the followup patch (which maybe I am? let me know :)), I'd:

• Rename _LIBCPP_SAFE_STATIC to _LIBCPP_CONSTINIT

-Make _LIBCPP_CONSTINIT expand to constinit in C++20 mode, else __attribute__((__require_constant_initialization__)) if supported, else seriously consider making it a hard error (where right now it expands to nothing).

• Rename TEST_SAFE_STATIC to TEST_CONSTINIT, and make it ​expand to _LIBCPP_CONSTINIT if it's defined, else if C++20 then constinit, else nothing.

I think this idea sounds fine, and I if you want to clean this up even more, please do.

[ldionne]

I agree with the suggested cleanup too if someone's up for it.

[• Quuxplusone]

In D118874#3298038, @ldionne wrote:

I agree with the suggested cleanup too if someone's up for it.

I'll take it on, if nobody beats me to it.

[Mordante]

In D118874#3298293, @Quuxplusone wrote:

In D118874#3298038, @ldionne wrote:

I agree with the suggested cleanup too if someone's up for it.

I'll take it on, if nobody beats me to it.

I've landed the patch, feel free to make the improvements.

libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp

using std::any;
             std::is_nothrow_default_constructible<any>::value
           , "Must be default constructible"
           );
     }
     {
         struct TestConstexpr : public std::any {
           constexpr TestConstexpr() : std::any() {}
         };
-#ifdef _LIBCPP_SAFE_STATIC
-        _LIBCPP_SAFE_STATIC static std::any a;
+        TEST_SAFE_STATIC static std::any a;
         ((void)a);
-#endif
     }
     {
         DisableAllocationGuard g; ((void)g);
         any const a;
         assertEmpty(a);
     }
 
   return 0;
 }

libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/default.pass.cpp

 #include <memory>
 #include <cassert>
 #include "test_macros.h"
 
 #include "test_macros.h"
 #include "deleter_types.h"
 #include "unique_ptr_test_helper.h"
 
 #if defined(_LIBCPP_VERSION) && TEST_STD_VER >= 11
-_LIBCPP_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single;
-_LIBCPP_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime;
+TEST_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single;
+TEST_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime;
 #endif
 
 #if TEST_STD_VER >= 11
 struct NonDefaultDeleter {
   NonDefaultDeleter() = delete;
   void operator()(void*) const {}
 };
 #endif

libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/nullptr.pass.cpp

 #include <memory>
 #include <cassert>
 
 #include "test_macros.h"
 #include "unique_ptr_test_helper.h"
 
 
 #if defined(_LIBCPP_VERSION) && TEST_STD_VER >= 11
-_LIBCPP_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single(nullptr);
-_LIBCPP_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime(nullptr);
+TEST_SAFE_STATIC std::unique_ptr<int> global_static_unique_ptr_single(nullptr);
+TEST_SAFE_STATIC std::unique_ptr<int[]> global_static_unique_ptr_runtime(nullptr);
 #endif
 
 
 #if TEST_STD_VER >= 11
 struct NonDefaultDeleter {
   NonDefaultDeleter() = delete;
   void operator()(void*) const {}
 };