[libc++] Use a different smart ptr type alias

[androm3da]

The _SP type is used by some C libraries and this alias could conflict with it.

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Brian Cain (androm3da)

Changes

The _SP type is used by some C libraries and this alias could conflict with it.

---

Full diff: https://github.com/llvm/llvm-project/pull/102089.diff

2 Files Affected:

• (modified) libcxx/include/__memory/inout_ptr.h (+5-5)
• (modified) libcxx/include/__memory/out_ptr.h (+4-4)

diff --git a/libcxx/include/__memory/inout_ptr.h b/libcxx/include/__memory/inout_ptr.h
index 72e1a21ad6867..e5f3ac5d027e8 100644
--- a/libcxx/include/__memory/inout_ptr.h
+++ b/libcxx/include/__memory/inout_ptr.h
@@ -63,17 +63,17 @@ class _LIBCPP_TEMPLATE_VIS inout_ptr_t {
       }
     }
 
-    using _SP = __pointer_of_or_t<_Smart, _Pointer>;
+    using _SmartPtr = __pointer_of_or_t<_Smart, _Pointer>;
     if constexpr (is_pointer_v<_Smart>) {
-      std::apply([&](auto&&... __args) { __s_ = _Smart(static_cast<_SP>(__p_), std::forward<_Args>(__args)...); },
+      std::apply([&](auto&&... __args) { __s_ = _Smart(static_cast<_SmartPtr>(__p_), std::forward<_Args>(__args)...); },
                  std::move(__a_));
     } else if constexpr (__resettable_smart_pointer_with_args<_Smart, _Pointer, _Args...>) {
-      std::apply([&](auto&&... __args) { __s_.reset(static_cast<_SP>(__p_), std::forward<_Args>(__args)...); },
+      std::apply([&](auto&&... __args) { __s_.reset(static_cast<_SmartPtr>(__p_), std::forward<_Args>(__args)...); },
                  std::move(__a_));
     } else {
-      static_assert(is_constructible_v<_Smart, _SP, _Args...>,
+      static_assert(is_constructible_v<_Smart, _SmartPtr, _Args...>,
                     "The smart pointer must be constructible from arguments of types _Smart, _Pointer, _Args...");
-      std::apply([&](auto&&... __args) { __s_ = _Smart(static_cast<_SP>(__p_), std::forward<_Args>(__args)...); },
+      std::apply([&](auto&&... __args) { __s_ = _Smart(static_cast<_SmartPtr>(__p_), std::forward<_Args>(__args)...); },
                  std::move(__a_));
     }
   }
diff --git a/libcxx/include/__memory/out_ptr.h b/libcxx/include/__memory/out_ptr.h
index 95aa2029c9231..fd99110790cc8 100644
--- a/libcxx/include/__memory/out_ptr.h
+++ b/libcxx/include/__memory/out_ptr.h
@@ -58,14 +58,14 @@ class _LIBCPP_TEMPLATE_VIS out_ptr_t {
       return;
     }
 
-    using _SP = __pointer_of_or_t<_Smart, _Pointer>;
+    using _SmartPtr = __pointer_of_or_t<_Smart, _Pointer>;
     if constexpr (__resettable_smart_pointer_with_args<_Smart, _Pointer, _Args...>) {
-      std::apply([&](auto&&... __args) { __s_.reset(static_cast<_SP>(__p_), std::forward<_Args>(__args)...); },
+      std::apply([&](auto&&... __args) { __s_.reset(static_cast<_SmartPtr>(__p_), std::forward<_Args>(__args)...); },
                  std::move(__a_));
     } else {
-      static_assert(is_constructible_v<_Smart, _SP, _Args...>,
+      static_assert(is_constructible_v<_Smart, _SmartPtr, _Args...>,
                     "The smart pointer must be constructible from arguments of types _Smart, _Pointer, _Args...");
-      std::apply([&](auto&&... __args) { __s_ = _Smart(static_cast<_SP>(__p_), std::forward<_Args>(__args)...); },
+      std::apply([&](auto&&... __args) { __s_ = _Smart(static_cast<_SmartPtr>(__p_), std::forward<_Args>(__args)...); },
                  std::move(__a_));
     }
   }

[androm3da]

_SP is a preprocessor define in dinkumware libc's ctype.h. It might be nice to change this recently-introduced alias to avoid collisions when building libc++.

e.g. here is someone's copy of this C library: https://github.com/wuzhouhui/c_standard_lib/blob/e11548ad943686d303f0029d71ac2526d8b39cc5/_HEADERS/CTYPE.H#L12

cc @H-G-Hristov

[mordante]

Thanks for looking into this!

Can you update the test libcxx/test/libcxx/system_reserved_names.gen.py with these ctype.h macros? That avoids us to use these names in the future.

[androm3da]

Thanks for looking into this!

Can you update the test libcxx/test/libcxx/system_reserved_names.gen.py with these ctype.h macros? That avoids us to use these names in the future.

done

[github-actions]

✅ With the latest revision this PR passed the Python code formatter.

[Zingam]

_SP is a preprocessor define in dinkumware libc's ctype.h. It might be nice to change this recently-introduced alias to avoid collisions when building libc++.

e.g. here is someone's copy of this C library: https://github.com/wuzhouhui/c_standard_lib/blob/e11548ad943686d303f0029d71ac2526d8b39cc5/_HEADERS/CTYPE.H#L12

cc @H-G-Hristov

Thank you! LGTM. IMO. This should be cherrypicked into LLVM 19 too.

[mordante]

Thanks LGTM!

[androm3da]

/cherry-pick baa72c4

[llvmbot]

Failed to cherry-pick: baa72c4

https://github.com/llvm/llvm-project/actions/runs/10363622325

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

[androm3da]

Failed to cherry-pick: baa72c4

whoops wrong SHA. I will fix it.

[androm3da]

/cherry-pick 7951673

[llvmbot]

/pull-request #103003