Also run the capability qualifier test when compiling for C++

CTSRD-CHERI · Jul 7, 2023 · 40b9240 · 40b9240
1 parent 649bdec
commit 40b9240
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/clang/test/Sema/cheri/cheri-capability-qualifier-typedef.c b/clang/test/Sema/cheri/cheri-capability-qualifier-typedef.c
@@ -1,6 +1,13 @@
-// RUN: %cheri_cc1 %s -fsyntax-only -verify
+// RUN: %cheri_cc1 %s -fsyntax-only -verify=expected,c
+// RUN: %cheri_cc1 -xc++ %s -fsyntax-only -verify=expected,cxx
+// RUN: %cheri_cc1 -xc++ -Dtypeof=decltype %s -fsyntax-only -verify=expected,cxx
 
+#ifdef __cplusplus
+#define CHECK_SAME(a, b) static_assert(__is_same(a *, b *), "")
+#else
 #define CHECK_SAME(a, b) _Static_assert(__builtin_types_compatible_p(a *, b *), "")
+#endif
+
 #define _CONCAT(a, b) a##b
 #define CONCAT(a, b) _CONCAT(a, b)
 #define CHECK_TYPE(ty, expected)                                 \
@@ -41,8 +48,11 @@ CHECK_TYPE(__capability scap *, struct s *__capability *);
 CHECK_TYPE(scap __capability *, struct s *__capability *);
 
 CHECK_TYPE(__capability s **, struct s *__capability *); // expected-error 2{{use of __capability is ambiguous}}
-// expected-error@-1 3{{static_assert failed due to requirement '__builtin_types_compatible_p(struct s ***, struct s * __capability **)'}}
+// c-error@-1 3{{static_assert failed due to requirement '__builtin_types_compatible_p(struct s ***, struct s * __capability **)'}}
+// cxx-error@-2 3{{static_assert failed due to requirement '__is_same(s ***, s * __capability **)'}}
 CHECK_TYPE(s __capability **, struct s *__capability *); // expected-error 2{{use of __capability is ambiguous}}
-// expected-error@-1 3{{static_assert failed due to requirement '__builtin_types_compatible_p(struct s ***, struct s * __capability **)'}}
+// c-error@-1 3{{static_assert failed due to requirement '__builtin_types_compatible_p(struct s ***, struct s * __capability **)'}}
+// cxx-error@-2 3{{static_assert failed due to requirement '__is_same(s ***, s * __capability **)'}}
 CHECK_TYPE(__capability s *__capability *, struct s *__capability *__capability); // expected-error 2 {{use of __capability is ambiguous}}
-// expected-error@-1 3{{static_assert failed due to requirement '__builtin_types_compatible_p(struct s * __capability **, struct s * __capability * __capability *)'}}
+// c-error@-1 3{{static_assert failed due to requirement '__builtin_types_compatible_p(struct s * __capability **, struct s * __capability * __capability *)'}}
+// cxx-error@-2 3{{static_assert failed due to requirement '__is_same(s * __capability **, s * __capability * __capability *)'}}