Address feedback

Author: MichaelRFairhurst

c/misra/src/rules/RULE-11-10/AtomicQualifierAppliedToVoid.ql

@@ -23,14 +23,33 @@ class AtomicVoidType extends Type {
   }
 }
 
-Type getNestedType(Type root) {
-  result = root
+predicate usesAtomicVoid(Type root) {
+  root instanceof AtomicVoidType
   or
-  exists(DerivedType derived | derived = root | result = getNestedType(derived.getBaseType()))
+  usesAtomicVoid(root.(DerivedType).getBaseType())
+  or
+  usesAtomicVoid(root.(RoutineType).getReturnType())
+  or
+  usesAtomicVoid(root.(RoutineType).getAParameterType())
+  or
+  usesAtomicVoid(root.(FunctionPointerType).getReturnType())
+  or
+  usesAtomicVoid(root.(FunctionPointerType).getAParameterType())
+  or
+  usesAtomicVoid(root.(TypedefType).getBaseType())
+}
+
+class ExplicitType extends Type {
+  Element getDeclaration(string description) {
+    result.(DeclarationEntry).getType() = this and description = result.(DeclarationEntry).getName()
+    or
+    result.(CStyleCast).getType() = this and description = "Cast"
+  }
 }
 
-from DeclarationEntry decl, AtomicVoidType atomicVoid
+from Element decl, ExplicitType explicitType, string elementDescription
 where
   not isExcluded(decl, Declarations9Package::atomicQualifierAppliedToVoidQuery()) and
-  atomicVoid = getNestedType(decl.getType())
-select decl, decl.getName() + " declared with an atomic void type."
+  decl = explicitType.getDeclaration(elementDescription) and
+  usesAtomicVoid(explicitType)
+select decl, elementDescription + " declared with an atomic void type."

c/misra/test/rules/RULE-11-10/AtomicQualifierAppliedToVoid.expected

@@ -1,3 +1,8 @@
 | test.c:3:15:3:16 | definition of g3 | g3 declared with an atomic void type. |
 | test.c:10:17:10:18 | definition of m3 | m3 declared with an atomic void type. |
 | test.c:15:22:15:23 | definition of p2 | p2 declared with an atomic void type. |
+| test.c:20:23:20:24 | declaration of f2 | f2 declared with an atomic void type. |
+| test.c:21:25:21:26 | declaration of f3 | f3 declared with an atomic void type. |
+| test.c:22:14:22:15 | declaration of f4 | f4 declared with an atomic void type. |
+| test.c:23:16:23:17 | declaration of f5 | f5 declared with an atomic void type. |
+| test.c:27:3:27:19 | (_Atomic(void) *)... | Cast declared with an atomic void type. |

c/misra/test/rules/RULE-11-10/test.c

@@ -15,4 +15,14 @@ void f(_Atomic int p1,  // COMPLIANT
        _Atomic void *p2 // NON_COMPLIANT
        // _Atomic void p3[] // doesn't compile, even though it perhaps should as
        // it is adjusted to void*.
-) {}
+) {}
+
+typedef _Atomic void *f2(void);     // NON_COMPLIANT
+typedef _Atomic void *(*f3)(void);  // NON_COMPLIANT
+typedef void f4(_Atomic void *);    // NON_COMPLIANT
+typedef void (*f5)(_Atomic void *); // NON_COMPLIANT
+
+void f6() {
+  (void *)0; // COMPLIANT
+  (_Atomic void *)0; // NON_COMPLIANT
+}