Rule 8.13: Expand ASM test

Author: lcartey

c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql

@@ -25,7 +25,12 @@ class NonConstPointerVariableCandidate extends Variable {
     // Ignore parameters in functions without bodies
     (this instanceof Parameter implies exists(this.(Parameter).getFunction().getBlock())) and
     // Ignore variables in functions that use ASM commands
-    not exists(AsmStmt a | a.getEnclosingFunction() = this.(LocalScopeVariable).getFunction()) and
+    not exists(AsmStmt a |
+      a.getEnclosingFunction() = this.(LocalScopeVariable).getFunction()
+      or
+      // In a type declared locally
+      this.(Field).getDeclaringType+().getEnclosingFunction() = a.getEnclosingFunction()
+    ) and
     // Avoid elements in macro expansions, as they cannot be equated across copies
     not this.isInMacroExpansion() and
     exists(PointerOrArrayType type |

c/misra/test/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.expected

@@ -12,4 +12,4 @@
 | test.c:66:23:66:24 | p1 | $@ points to a non-const-qualified type. | test.c:66:23:66:24 | p1 | p1 |
 | test.c:71:17:71:18 | p1 | $@ points to a non-const-qualified type. | test.c:71:17:71:18 | p1 | p1 |
 | test.c:75:15:75:16 | p1 | $@ points to a non-const-qualified type. | test.c:75:15:75:16 | p1 | p1 |
-| test.c:97:30:97:30 | s | $@ points to a non-const-qualified type. | test.c:97:30:97:30 | s | s |
+| test.c:103:30:103:30 | s | $@ points to a non-const-qualified type. | test.c:103:30:103:30 | s | s |

c/misra/test/rules/RULE-8-13/test.c

@@ -82,6 +82,12 @@ int f17(char *p1) { // NON_COMPLIANT
 int16_t
 test_r(int16_t *value) { // COMPLIANT - ignored because of the use of ASM
   int16_t result;
+  struct S {
+    int *x; // COMPLIANT - ignored because of the use of ASM
+    struct S2 {
+      int *y; // COMPLIANT - ignored because of the use of ASM
+    } s2;
+  };
   __asm__("movb %bh (%eax)");
   return result;
 }