Fix #755.

fjatWbyT · fjatWbyT · commit 66b4267e3759 · 2024-10-22T15:12:51.000+09:00
diff --git a/change_notes/2024-10-22-fix-fp-m6-5-3.md b/change_notes/2024-10-22-fix-fp-m6-5-3.md
@@ -0,0 +1,2 @@
+- `M6-5-3` - `Loops.qll`:
+  - Fixes #755. Specifies that the access to the loop counter must be via non-const address.
diff --git a/cpp/common/src/codingstandards/cpp/Loops.qll b/cpp/common/src/codingstandards/cpp/Loops.qll
@@ -204,7 +204,7 @@ predicate isLoopCounterModifiedInCondition(ForStmt forLoop, VariableAccess loopC
   loopCounterAccess = getAnIterationVariable(forLoop).getAnAccess() and
   (
     loopCounterAccess.isModified() or
-    loopCounterAccess.isAddressOfAccess()
+    loopCounterAccess.isAddressOfAccessNonConst()
   )
 }
 
@@ -219,7 +219,7 @@ predicate isLoopCounterModifiedInStatement(
   loopCounterAccess = loopCounter.getAnAccess() and
   (
     loopCounterAccess.isModified() or
-    loopCounterAccess.isAddressOfAccess()
+    loopCounterAccess.isAddressOfAccessNonConst()
   ) and
   forLoop.getStmt().getChildStmt*() = loopCounterAccess.getEnclosingStmt()
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+- `M6-5-3` - `Loops.qll`:
	`2`	`+ - Fixes #755. Specifies that the access to the loop counter must be via non-const address.`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ predicate isLoopCounterModifiedInCondition(ForStmt forLoop, VariableAccess loopC`
`204`	`204`	`loopCounterAccess = getAnIterationVariable(forLoop).getAnAccess() and`
`205`	`205`	`(`
`206`	`206`	`loopCounterAccess.isModified() or`
`207`		`- loopCounterAccess.isAddressOfAccess()`
	`207`	`+ loopCounterAccess.isAddressOfAccessNonConst()`
`208`	`208`	`)`
`209`	`209`	`}`
`210`	`210`
`@@ -219,7 +219,7 @@ predicate isLoopCounterModifiedInStatement(`
`219`	`219`	`loopCounterAccess = loopCounter.getAnAccess() and`
`220`	`220`	`(`
`221`	`221`	`loopCounterAccess.isModified() or`
`222`		`- loopCounterAccess.isAddressOfAccess()`
	`222`	`+ loopCounterAccess.isAddressOfAccessNonConst()`
`223`	`223`	`) and`
`224`	`224`	`forLoop.getStmt().getChildStmt*() = loopCounterAccess.getEnclosingStmt()`
`225`	`225`	`}`