Use __has_feature(cheri) in tests

Migrate tests that aren't explicitly about __has_feature(capabilities)
to __has_feature(cheri).

Author: brooksdavis

clang/test/CodeGen/builtin-align.c

@@ -40,7 +40,7 @@
 #error MISSING TYPE
 #endif
 
-#if !__has_feature(capabilities)
+#if !__has_feature(cheri)
 #define __capability
 #endif
 

clang/test/CodeGen/cheri/warn-ctoptr-functions.c

@@ -22,7 +22,7 @@ typedef	__sighandler_t	* __kerncap sig_t;	/* type of pointer to a signal functio
 typedef long sigset_t;
 struct __siginfo;
 
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 struct sigaction_c {
 	union {
 		void    (* __capability __sa_handler)(int);
@@ -42,7 +42,7 @@ struct sigaction_native {
 	sigset_t sa_mask;		/* signal mask to apply */
 };
 
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 typedef struct sigaction_c	ksigaction_t;
 #else
 typedef	struct sigaction_native	ksigaction_t;

clang/test/CodeGenCXX/cheri/constinit-zero-to-pointer.cpp

@@ -24,7 +24,7 @@ const AttributeData kBarcodeAttributeData{
 AttributeData test() { return kBarcodeAttributeData; }
 
 /// Also check enums with underlying type __intcap for CHERI targets:
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 enum class IntCapEnum : __intcap { Zero };
 
 void *intcapEnumToPtrConstant = (void *)IntCapEnum::Zero;

clang/test/SemaCXX/cheri/cheri-pointer-cast.cpp

@@ -9,7 +9,7 @@ typedef unsigned long ulong;
 
 int foo;
 
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 #define CAP __capability
 #else
 #define CAP
@@ -68,7 +68,7 @@ int main() {
 }
 
 // Check that we don't warn on dependent types
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 template <typename T>
 long offset_get(T x) {
   return __builtin_cheri_offset_get(reinterpret_cast<void * __capability>(x));

clang/test/SemaCXX/cheri/dependent-cast-crash.cpp

@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only %s -verify
 // RUN: %cheri_cc1 -fsyntax-only %s -verify
 // RUN: %cheri_purecap_cc1 -fsyntax-only %s -verify
-#if !__has_feature(capabilities)
+#if !__has_feature(cheri)
 #define __capability
 #endif
 

clang/test/SemaCXX/cheri/implicit-cap-conversion-return-value.cpp

@@ -7,7 +7,7 @@
 // RUN: %cheri_cc1 -Wall -Wcheri-pointer-conversion -verify=c,expected,hybrid,hybrid-c -x c -fsyntax-only %s
 // RUN: %cheri_purecap_cc1 -Wall -Wcheri-pointer-conversion -verify=c,expected,purecap,purecap-c -x c -fsyntax-only %s
 
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 typedef unsigned __intcap uintcap_t;
 #else
 typedef unsigned long uintcap_t;

clang/test/SemaCXX/cheri/overloaded-function-template-arg.cpp

@@ -32,7 +32,7 @@ void instantiate() {
   c<void(char), a>::function(1);         // expected-error{{address of overloaded function 'a' does not match required type 'void (char)'}}
 }
 
-#if __has_feature(capabilities)
+#if __has_feature(cheri)
 template <class T, T *__capability Func>
 // hybrid-note@-1 3 {{template parameter is declared here}}
 struct c_cap {

libcxx/test/support/charconv_test_helpers.h

@@ -292,35 +292,37 @@ constexpr auto concat(L1, L2) -> concat_t<L1, L2>
     return {};
 }
 
-auto all_signed = type_list<
-    char,
-    signed char,
-    short,
-    int,
-    long,
-    long long
+auto all_signed =
+    type_list< char,
+               signed char,
+               short,
+               int,
+               long,
+               long long
 #ifndef TEST_HAS_NO_INT128
-    ,
-    __int128_t
+               ,
+               __int128_t
 #endif
-#if __has_feature(capabilities)
-    , __intcap
+#if __has_feature(cheri)
+               ,
+               __intcap
 #endif
-    >();
-auto all_unsigned = type_list<
-    unsigned char,
-    unsigned short,
-    unsigned int,
-    unsigned long,
-    unsigned long long
+               >();
+auto all_unsigned =
+    type_list< unsigned char,
+               unsigned short,
+               unsigned int,
+               unsigned long,
+               unsigned long long
 #ifndef TEST_HAS_NO_INT128
-    ,
-    __uint128_t
+               ,
+               __uint128_t
 #endif
-#if __has_feature(capabilities)
-    , unsigned __intcap
+#if __has_feature(cheri)
+               ,
+               unsigned __intcap
 #endif
-    >();
+               >();
 auto integrals = concat(all_signed, all_unsigned);
 
 auto all_floats = type_list< float, double >(); //TODO: Add long double