C++: Also fix the FP in 'cpp/comparison-canceling-subexpr'.

MathiasVP · MathiasVP · commit 310353060e2c · 2021-12-14T17:08:10.000Z
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonWithCancelingSubExpr.ql b/cpp/ql/src/Likely Bugs/Arithmetic/ComparisonWithCancelingSubExpr.ql
@@ -85,7 +85,8 @@ private predicate cancelingSubExprs(ComparisonOperation cmp, VariableAccess a1,
   exists(Variable v |
     exists(float m | m < 0 and cmpLinearSubVariable(cmp, v, a1, m)) and
     exists(float m | m > 0 and cmpLinearSubVariable(cmp, v, a2, m))
-  )
+  ) and
+  not any(ClassTemplateInstantiation inst).getATemplateArgument() = cmp.getParent*()
 }
 
 from ComparisonOperation cmp, VariableAccess a1, VariableAccess a2

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ private predicate cancelingSubExprs(ComparisonOperation cmp, VariableAccess a1,`
`85`	`85`	`exists(Variable v \|`
`86`	`86`	`exists(float m \| m < 0 and cmpLinearSubVariable(cmp, v, a1, m)) and`
`87`	`87`	`exists(float m \| m > 0 and cmpLinearSubVariable(cmp, v, a2, m))`
`88`		`- )`
	`88`	`+ ) and`
	`89`	`+ not any(ClassTemplateInstantiation inst).getATemplateArgument() = cmp.getParent*()`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`from ComparisonOperation cmp, VariableAccess a1, VariableAccess a2`