Use upperbound/0 and getFullyConverted/0 to more precisely infer sizes

jeongsoolee09 · jeongsoolee09 · commit 1355effa734c · 2025-10-08T18:52:24.000-04:00
diff --git a/cpp/misra/src/rules/RULE-9-5-1/LegacyForStatementsShouldBeSimple.ql b/cpp/misra/src/rules/RULE-9-5-1/LegacyForStatementsShouldBeSimple.ql
@@ -185,11 +185,10 @@ private newtype TAlertType =
 /* 4. The type size of the loop counter is smaller than that of the loop bound. */
 TLoopCounterSmallerThanLoopBound(ForStmt forLoop, LegacyForLoopCondition forLoopCondition){
 forLoopCondition = forLoop.getCondition() and
- exists(Type loopCounterType, Type loopBoundType |
- loopCounterType = forLoopCondition.getLoopCounter().getType() and
- loopBoundType = forLoopCondition.getLoopBound().getType()
- |
- loopCounterType.getSize() < loopBoundType.getSize()
+ exists(Expr loopCounter, Expr loopBound |
+ loopCounter = forLoopCondition.getLoopCounter() and
+ loopBound = forLoopCondition.getLoopBound() and
+ upperBound(loopCounter.getFullyConverted()) < upperBound(loopBound.getFullyConverted())
 )
 } or
 /* 5-1-1. The loop bound is a variable that is mutated in the for loop. */

-Original file line number
+Diff line change
 /* 4. The type size of the loop counter is smaller than that of the loop bound. */
 TLoopCounterSmallerThanLoopBound(ForStmtforLoop,LegacyForLoopConditionforLoopCondition){
 forLoopCondition=forLoop.getCondition()and
 -exists(TypeloopCounterType,TypeloopBoundType|
 -loopCounterType=forLoopCondition.getLoopCounter().getType()and
 -loopBoundType=forLoopCondition.getLoopBound().getType()
 -|
 -loopCounterType.getSize()<loopBoundType.getSize()
 +exists(ExprloopCounter,ExprloopBound|
 +loopCounter=forLoopCondition.getLoopCounter()and
 +loopBound=forLoopCondition.getLoopBound()and
 +upperBound(loopCounter.getFullyConverted())<upperBound(loopBound.getFullyConverted())
+)
 }or
 /* 5-1-1. The loop bound is a variable that is mutated in the for loop. */