Debug 5-1-2 and 5-2-2 not being reported

Author: jeongsoolee09

cpp/misra/src/rules/RULE-9-5-1/LegacyForStatementsShouldBeSimple.ql

@@ -211,15 +211,8 @@ private newtype TAlertType =
     variableModifiedInExpression(mutatingExpr, loopBound.(VariableAccess).getTarget().getAnAccess())
   } or
   /* 5-1-2. The loop bound is not a variable access nor a constant expression. */
-  TLoopBoundIsNonConstExpr(ForStmt forLoop, Expr loopBound, Expr mutatingExpr) {
+  TLoopBoundIsNonConstExpr(ForStmt forLoop, Expr loopBound) {
     loopBound = forLoop.getCondition().(LegacyForLoopCondition).getLoopBound() and
-    (
-      /* The mutating expression may be in the loop body. */
-      mutatingExpr = forLoop.getStmt().getChildStmt().getAChild*()
-      or
-      /* The mutating expression may be in the loop updating expression. */
-      mutatingExpr = forLoop.getUpdate().getAChild*()
-    ) and
     (not loopBound instanceof VariableAccess and not loopBound.isConstant())
   } or
   /* 5-2-1. The loop step is a variable that is mutated in the for loop. */
@@ -235,15 +228,8 @@ private newtype TAlertType =
     variableModifiedInExpression(mutatingExpr, loopStep.(VariableAccess).getTarget().getAnAccess())
   } or
   /* 5-2-2. The loop step is not a variable access nor a constant expression. */
-  TLoopStepIsNonConstExpr(ForStmt forLoop, Expr loopStep, Expr mutatingExpr) {
+  TLoopStepIsNonConstExpr(ForStmt forLoop, Expr loopStep) {
     loopStep = getLoopStepOfForStmt(forLoop) and
-    (
-      /* The mutating expression may be in the loop body. */
-      mutatingExpr = forLoop.getStmt().getChildStmt().getAChild*()
-      or
-      /* The mutating expression may be in the loop updating expression. */
-      mutatingExpr = forLoop.getUpdate().getAChild*()
-    ) and
     (not loopStep instanceof VariableAccess and not loopStep.isConstant())
   } or
   /*
@@ -298,9 +284,9 @@ class AlertType extends TAlertType {
     this = TLoopCounterMutatedInLoopBody(result, _) or
     this = TLoopCounterSmallerThanLoopBound(result, _) or
     this = TLoopBoundIsMutatedVariableAccess(result, _, _) or
-    this = TLoopStepIsNonConstExpr(result, _, _) or
-    this = TLoopBoundIsMutatedVariableAccess(result, _, _) or
-    this = TLoopStepIsNonConstExpr(result, _, _) or
+    this = TLoopBoundIsNonConstExpr(result, _) or
+    this = TLoopStepIsMutatedVariableAccess(result, _, _) or
+    this = TLoopStepIsNonConstExpr(result, _) or
     this = TLoopCounterIsTakenNonConstAddress(result, _) or
     this = TLoopBoundIsTakenNonConstAddress(result, _) or
     this = TLoopStepIsTakenNonConstAddress(result, _)
@@ -321,11 +307,11 @@ class AlertType extends TAlertType {
       result = forLoopCondition.getLoopCounter()
     )
     or
-    this = TLoopBoundIsNonConstExpr(_, result, _)
+    this = TLoopBoundIsNonConstExpr(_, result)
     or
     this = TLoopBoundIsMutatedVariableAccess(_, result, _)
     or
-    this = TLoopStepIsNonConstExpr(_, result, _)
+    this = TLoopStepIsNonConstExpr(_, result)
     or
     this = TLoopStepIsMutatedVariableAccess(_, result, _)
     or
@@ -355,13 +341,13 @@ class AlertType extends TAlertType {
     this = TLoopBoundIsMutatedVariableAccess(_, _, _) and
     result = "loop bound"
     or
-    this = TLoopBoundIsNonConstExpr(_, _, _) and
+    this = TLoopBoundIsNonConstExpr(_, _) and
     result = "loop bound"
     or
     this = TLoopStepIsMutatedVariableAccess(_, _, _) and
     result = "loop step"
     or
-    this = TLoopStepIsNonConstExpr(_, _, _) and
+    this = TLoopStepIsNonConstExpr(_, _) and
     result = "loop step"
     or
     this = TLoopCounterIsTakenNonConstAddress(_, _) and
@@ -391,14 +377,14 @@ class AlertType extends TAlertType {
     this = TLoopCounterSmallerThanLoopBound(_, _) and
     result = "The $@ has a smaller type than that of the $@."
     or
-    this = TLoopBoundIsNonConstExpr(_, _, _) and
-    result = "The $@ is a non-const expression, or a variable that is $@ in the loop."
+    this = TLoopBoundIsNonConstExpr(_, _) and
+    result = "The $@ is a $@."
     or
     this = TLoopBoundIsMutatedVariableAccess(_, _, _) and
     result = "The $@ is a non-const expression, or a variable that is $@ in the loop."
     or
-    this = TLoopStepIsNonConstExpr(_, _, _) and
-    result = "The $@ is a non-const expression, or a variable that is $@ in the loop."
+    this = TLoopStepIsNonConstExpr(_, _) and
+    result = "The $@ is a $@."
     or
     this = TLoopStepIsMutatedVariableAccess(_, _, _) and
     result = "The $@ is a non-const expression, or a variable that is $@ in the loop."
@@ -425,11 +411,11 @@ class AlertType extends TAlertType {
       result = forLoopCondition.getLoopBound()
     )
     or
-    this = TLoopBoundIsNonConstExpr(_, _, result)
+    this = TLoopBoundIsNonConstExpr(_, result)
     or
     this = TLoopBoundIsMutatedVariableAccess(_, _, result)
     or
-    this = TLoopStepIsNonConstExpr(_, _, result)
+    this = TLoopStepIsNonConstExpr(_, result)
     or
     this = TLoopStepIsMutatedVariableAccess(_, _, result)
     or
@@ -453,14 +439,14 @@ class AlertType extends TAlertType {
     this = TLoopCounterSmallerThanLoopBound(_, _) and
     result = "loop bound"
     or
-    this = TLoopBoundIsNonConstExpr(_, _, _) and
-    result = "mutated"
+    this = TLoopBoundIsNonConstExpr(_, _) and
+    result = "non-const expression"
     or
     this = TLoopBoundIsMutatedVariableAccess(_, _, _) and
     result = "mutated"
     or
-    this = TLoopStepIsNonConstExpr(_, _, _) and
-    result = "mutated"
+    this = TLoopStepIsNonConstExpr(_, _) and
+    result = "non-const expression"
     or
     this = TLoopStepIsMutatedVariableAccess(_, _, _) and
     result = "mutated"