zoecarver updated this revision to Diff 255362.
zoecarver added a comment.
Diff from master not last commit.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D77519/new/
https://reviews.llvm.org/D77519
Files:
clang/lib/Sema/SemaExprCXX.cpp
clang/test/SemaObjCXX/type-traits-is-pointer.mm
libcxx/include/type_traits
Index: libcxx/include/type_traits
===================================================================
--- libcxx/include/type_traits
+++ libcxx/include/type_traits
@@ -897,6 +897,19 @@
// is_pointer
+// In clang 10.0.0 and earlier __is_pointer didn't work with Objective-C types.
+#if __has_keyword(__is_pointer) && _LIBCPP_CLANG_VER > 1000
+
+template<class _Tp>
+struct _LIBCPP_TEMPLATE_VIS is_pointer : _BoolConstant<__is_pointer(_Tp)> { };
+
+#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
+template <class _Tp>
+_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_pointer_v = __is_pointer(_Tp);
+#endif
+
+#else // __has_keyword(__is_pointer)
+
template <class _Tp> struct __libcpp_is_pointer : public false_type {};
template <class _Tp> struct __libcpp_is_pointer<_Tp*> : public true_type {};
@@ -917,6 +930,8 @@
= is_pointer<_Tp>::value;
#endif
+#endif // __has_keyword(__is_pointer)
+
// is_reference
#if __has_keyword(__is_lvalue_reference) && \
Index: clang/test/SemaObjCXX/type-traits-is-pointer.mm
===================================================================
--- /dev/null
+++ clang/test/SemaObjCXX/type-traits-is-pointer.mm
@@ -0,0 +1,48 @@
+// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -verify %s
+// expected-no-diagnostics
+
+template <typename T>
+void test_is_pointer() {
+ static_assert(__is_pointer(T), "");
+
+ static_assert(__is_pointer(T __weak), "");
+ static_assert(__is_pointer(T __strong), "");
+ static_assert(__is_pointer(T __autoreleasing), "");
+ static_assert(__is_pointer(T __unsafe_unretained), "");
+
+ static_assert(__is_pointer(T __weak const), "");
+ static_assert(__is_pointer(T __strong const), "");
+ static_assert(__is_pointer(T __autoreleasing const), "");
+ static_assert(__is_pointer(T __unsafe_unretained const), "");
+
+ static_assert(__is_pointer(T __weak volatile), "");
+ static_assert(__is_pointer(T __strong volatile), "");
+ static_assert(__is_pointer(T __autoreleasing volatile), "");
+ static_assert(__is_pointer(T __unsafe_unretained volatile), "");
+
+ static_assert(__is_pointer(T __weak const volatile), "");
+ static_assert(__is_pointer(T __strong const volatile), "");
+ static_assert(__is_pointer(T __autoreleasing const volatile), "");
+ static_assert(__is_pointer(T __unsafe_unretained const volatile), "");
+}
+
+@class Foo;
+
+int main(int, char**) {
+ test_is_pointer<id>();
+ test_is_pointer<id const>();
+ test_is_pointer<id volatile>();
+ test_is_pointer<id const volatile>();
+
+ test_is_pointer<Foo*>();
+ test_is_pointer<Foo const*>();
+ test_is_pointer<Foo volatile*>();
+ test_is_pointer<Foo const volatile*>();
+
+ test_is_pointer<void*>();
+ test_is_pointer<void const*>();
+ test_is_pointer<void volatile*>();
+ test_is_pointer<void const volatile*>();
+
+ return 0;
+}
Index: clang/lib/Sema/SemaExprCXX.cpp
===================================================================
--- clang/lib/Sema/SemaExprCXX.cpp
+++ clang/lib/Sema/SemaExprCXX.cpp
@@ -4692,7 +4692,7 @@
case UTT_IsArray:
return T->isArrayType();
case UTT_IsPointer:
- return T->isPointerType();
+ return T->isAnyPointerType();
case UTT_IsLvalueReference:
return T->isLValueReferenceType();
case UTT_IsRvalueReference:
Index: libcxx/include/type_traits
===================================================================
--- libcxx/include/type_traits
+++ libcxx/include/type_traits
@@ -897,6 +897,19 @@
// is_pointer
+// In clang 10.0.0 and earlier __is_pointer didn't work with Objective-C types.
+#if __has_keyword(__is_pointer) && _LIBCPP_CLANG_VER > 1000
+
+template<class _Tp>
+struct _LIBCPP_TEMPLATE_VIS is_pointer : _BoolConstant<__is_pointer(_Tp)> { };
+
+#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
+template <class _Tp>
+_LIBCPP_INLINE_VAR _LIBCPP_CONSTEXPR bool is_pointer_v = __is_pointer(_Tp);
+#endif
+
+#else // __has_keyword(__is_pointer)
+
template <class _Tp> struct __libcpp_is_pointer : public false_type {};
template <class _Tp> struct __libcpp_is_pointer<_Tp*> : public true_type {};
@@ -917,6 +930,8 @@
= is_pointer<_Tp>::value;
#endif
+#endif // __has_keyword(__is_pointer)
+
// is_reference
#if __has_keyword(__is_lvalue_reference) && \
Index: clang/test/SemaObjCXX/type-traits-is-pointer.mm
===================================================================
--- /dev/null
+++ clang/test/SemaObjCXX/type-traits-is-pointer.mm
@@ -0,0 +1,48 @@
+// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -verify %s
+// expected-no-diagnostics
+
+template <typename T>
+void test_is_pointer() {
+ static_assert(__is_pointer(T), "");
+
+ static_assert(__is_pointer(T __weak), "");
+ static_assert(__is_pointer(T __strong), "");
+ static_assert(__is_pointer(T __autoreleasing), "");
+ static_assert(__is_pointer(T __unsafe_unretained), "");
+
+ static_assert(__is_pointer(T __weak const), "");
+ static_assert(__is_pointer(T __strong const), "");
+ static_assert(__is_pointer(T __autoreleasing const), "");
+ static_assert(__is_pointer(T __unsafe_unretained const), "");
+
+ static_assert(__is_pointer(T __weak volatile), "");
+ static_assert(__is_pointer(T __strong volatile), "");
+ static_assert(__is_pointer(T __autoreleasing volatile), "");
+ static_assert(__is_pointer(T __unsafe_unretained volatile), "");
+
+ static_assert(__is_pointer(T __weak const volatile), "");
+ static_assert(__is_pointer(T __strong const volatile), "");
+ static_assert(__is_pointer(T __autoreleasing const volatile), "");
+ static_assert(__is_pointer(T __unsafe_unretained const volatile), "");
+}
+
+@class Foo;
+
+int main(int, char**) {
+ test_is_pointer<id>();
+ test_is_pointer<id const>();
+ test_is_pointer<id volatile>();
+ test_is_pointer<id const volatile>();
+
+ test_is_pointer<Foo*>();
+ test_is_pointer<Foo const*>();
+ test_is_pointer<Foo volatile*>();
+ test_is_pointer<Foo const volatile*>();
+
+ test_is_pointer<void*>();
+ test_is_pointer<void const*>();
+ test_is_pointer<void volatile*>();
+ test_is_pointer<void const volatile*>();
+
+ return 0;
+}
Index: clang/lib/Sema/SemaExprCXX.cpp
===================================================================
--- clang/lib/Sema/SemaExprCXX.cpp
+++ clang/lib/Sema/SemaExprCXX.cpp
@@ -4692,7 +4692,7 @@
case UTT_IsArray:
return T->isArrayType();
case UTT_IsPointer:
- return T->isPointerType();
+ return T->isAnyPointerType();
case UTT_IsLvalueReference:
return T->isLValueReferenceType();
case UTT_IsRvalueReference:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
