[AST] Handle AtomicType in ASTContext::getNonProvenanceCarryingType

Fixes #656
CTSRD-CHERI · Aug 18, 2023 · 0487abc · 0487abc
1 parent 2f2dd31
commit 0487abc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
@@ -10900,7 +10900,10 @@ QualType ASTContext::getNonProvenanceCarryingType(QualType T) const {
   // if (!Target->SupportsCapabilities())
   //  return T; // XXX: should probably assert instead?
   assert(Target->SupportsCapabilities());
-  // Must be called with either intcap_t or uintcap_t
+  // Must be called with either intcap_t or uintcap_t (or atomic variants
+  // thereof)
+  if (const AtomicType *AT = dyn_cast<AtomicType>(T.getCanonicalType()))
+    return getAtomicType(getNonProvenanceCarryingType(AT->getValueType()));
   if (const BuiltinType *BT = dyn_cast<BuiltinType>(T.getCanonicalType())) {
     if (BT->getKind() == BuiltinType::IntCap)
       return NoProvenanceIntCapTy;

diff --git a/clang/test/Sema/cheri/atomic-init.c b/clang/test/Sema/cheri/atomic-init.c
@@ -0,0 +1,10 @@
+// RUN: %cheri_cc1 %s -ast-dump | FileCheck %s
+// RUN: %cheri_purecap_cc1 %s -ast-dump | FileCheck %s
+
+/// Crashed with "Invalid type passed to getNonProvenanceCarryingType" due to
+/// not handling AtomicType
+// CHECK:      VarDecl {{.*}} <{{.*}}:[[@LINE+4]]:1, col:22> col:18 x '_Atomic(__intcap)' cinit
+// CHECK-NEXT:   ImplicitCastExpr {{.*}} <col:22> '_Atomic(__intcap __attribute__((cheri_no_provenance)))' <NonAtomicToAtomic>
+// CHECK-NEXT:     ImplicitCastExpr {{.*}} <col:22> '__intcap __attribute__((cheri_no_provenance))':'__intcap' <IntegralCast>
+// CHECK-NEXT:       IntegerLiteral {{.*}} <col:22> 'int' 0
+_Atomic __intcap x = 0;