diff --git a/libcxx/include/typeinfo b/libcxx/include/typeinfo
index 9e54973898c06b..cdb07e6008c4a5 100644
--- a/libcxx/include/typeinfo
+++ b/libcxx/include/typeinfo
@@ -275,9 +275,8 @@ struct __type_info_implementations {
           __impl;
 };
 
-#    if __has_cpp_attribute(_Clang::__ptrauth_vtable_pointer__) && __has_feature(__ptrauth_calls__)
-#      if __has_feature(__ptrauth_vtable_address_discrimination__) ||                                                  \
-          __has_feature(__ptrauth_vtable_type_discrimination__)
+#    if __has_cpp_attribute(_Clang::__ptrauth_vtable_pointer__)
+#      if __has_feature(ptrauth_type_info_discriminated_vtable_pointer)
 #        define _LIBCPP_TYPE_INFO_VTABLE_POINTER_AUTH                                                                  \
           [[_Clang::__ptrauth_vtable_pointer__(process_independent, address_discrimination, type_discrimination)]]
 #      else