Reinstate macro instantiation results

Author: lcartey

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

@@ -31,8 +31,6 @@ class NonConstPointerVariableCandidate extends Variable {
       // 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 |
       // include only pointers which point to a const-qualified type
       this.getType() = type and

cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll

@@ -85,11 +85,9 @@ module HoldsForAllCopies<CandidateElementSig CandidateElement, ElementSetSig Ele
       string filepath, int startline, int startcolumn, int endline, int endcolumn
     ) {
       exists(CandidateElement s |
-        // Only consider candidates where we can match up the location
-        isNotWithinMacroExpansion(s) and
         hasLocation(s, filepath, startline, startcolumn, endline, endcolumn) and
         // All relevant elements that occur at the same location are candidates
-        forex(RelevantElement relevantElement | s = relevantElement.getCandidateElement() |
+        forall(RelevantElement relevantElement | s = relevantElement.getCandidateElement() |
           relevantElement instanceof CandidateElement
         )
       )