github
diff --git a/‎c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
Copy file name to clipboardExpand all lines: c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
-2Lines changed: 0 additions & 2 deletions b/‎c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
Copy file name to clipboardExpand all lines: c/misra/src/rules/RULE-8-13/PointerShouldPointToConstTypeWhenPossible.ql
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
+1-3Lines changed: 1 addition & 3 deletions b/‎cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/alertreporting/HoldsForAllCopies.qll
+1-3Lines changed: 1 addition & 3 deletions
@@ -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
 
@@ -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
         )
       )
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,9 @@ module HoldsForAllCopies<CandidateElementSig CandidateElement, ElementSetSig Ele`
`85`	`85`	`string filepath, int startline, int startcolumn, int endline, int endcolumn`
`86`	`86`	`) {`
`87`	`87`	`exists(CandidateElement s \|`
`88`		`- // Only consider candidates where we can match up the location`
`89`		`- isNotWithinMacroExpansion(s) and`
`90`	`88`	`hasLocation(s, filepath, startline, startcolumn, endline, endcolumn) and`
`91`	`89`	`// All relevant elements that occur at the same location are candidates`
`92`		`- forex(RelevantElement relevantElement \| s = relevantElement.getCandidateElement() \|`
	`90`	`+ forall(RelevantElement relevantElement \| s = relevantElement.getCandidateElement() \|`
`93`	`91`	`relevantElement instanceof CandidateElement`
`94`	`92`	`)`
`95`	`93`	`)`