Allow &(f) under rule 17-12

Author: MichaelRFairhurst

c/misra/src/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.ql

@@ -15,13 +15,7 @@ import cpp
 import codingstandards.c.misra
 
 predicate isImplicitlyAddressed(FunctionAccess access) {
-  (
-    not access.getParent() instanceof AddressOfExpr
-    or
-    // This catches "&(foo)", which could be considered to be somewhat less
-    // readable than "(&foo)".
-    exists(ParenthesisExpr parens | parens.getExpr() = access)
-  ) and
+  not access.getParent() instanceof AddressOfExpr and
   // Note: the following *seems* to only exist in c++ codebases, for instance,
   // when calling a member. In c, this syntax should always extract as a
   // [FunctionCall] rather than a [ExprCall] of a [FunctionAccess]. Still, this

c/misra/test/rules/RULE-17-12/FunctionAddressesShouldAddressOperator.expected

@@ -1,10 +1,8 @@
 | test.c:14:25:14:29 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:15:27:15:31 | func3 | The address of function func3 is taken without the & operator. |
+| test.c:15:25:15:29 | func3 | The address of function func3 is taken without the & operator. |
 | test.c:21:12:21:16 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:38:3:38:7 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:39:3:39:7 | func2 | The address of function func2 is taken without the & operator. |
-| test.c:47:5:47:9 | func1 | The address of function func1 is taken without the & operator. |
-| test.c:48:5:48:9 | func2 | The address of function func2 is taken without the & operator. |
 | test.c:57:13:57:17 | func1 | The address of function func1 is taken without the & operator. |
 | test.c:58:21:58:25 | func2 | The address of function func2 is taken without the & operator. |
 | test.c:59:13:59:17 | func1 | The address of function func1 is taken without the & operator. |

c/misra/test/rules/RULE-17-12/test.c

@@ -10,9 +10,9 @@ typedef void (*func_ptr_t1)();
 typedef void (*func_ptr_t2)(int x, char *y);
 typedef s (*func_ptr_t3)();
 
-func_ptr_t1 func_ptr1 = &func1;   // COMPLIANT
-func_ptr_t2 func_ptr2 = func2;    // NON-COMPLIANT
-func_ptr_t3 func_ptr3 = &(func3); // NON-COMPLIANT
+func_ptr_t1 func_ptr1 = &func1;    // COMPLIANT
+func_ptr_t2 func_ptr2 = func2;     // NON-COMPLIANT
+func_ptr_t3 func_ptr3 = func3 + 0; // NON-COMPLIANT
 
 void take_func(func_ptr_t1 f1, func_ptr_t2 f2);
 
@@ -44,8 +44,8 @@ void test() {
   (func1)();           // COMPLIANT
   (func2)(1, "hello"); // COMPLIANT
 
-  &(func1); // NON-COMPLIANT
-  &(func2); // NON-COMPLIANT
+  &(func1); // COMPLIANT
+  &(func2); // COMPLIANT
 
   (&func1)();           // COMPLIANT
   (&func2)(1, "hello"); // COMPLIANT