@@ -64,24 +64,25 @@ private Guard sizeGuard(Expr e, boolean branch, boolean upper) {
6464 branch = true
6565 )
6666 )
67- or
68- result .isEquality ( e , _, branch ) and
69- ( upper = true or upper = false )
7067}
7168
72- private predicate sizeGuardLessThan ( Guard g , Expr e , boolean branch ) {
73- g = sizeGuard ( e , branch , true )
69+ private predicate sizeGuardLessThan ( Guard g , Expr e , GuardValue gv ) {
70+ g = sizeGuard ( e , gv .asBooleanValue ( ) , true )
71+ or
72+ g .isEquality ( e , _, gv )
7473}
7574
76- private predicate sizeGuardGreaterThan ( Guard g , Expr e , boolean branch ) {
77- g = sizeGuard ( e , branch , false )
75+ private predicate sizeGuardGreaterThan ( Guard g , Expr e , GuardValue gv ) {
76+ g = sizeGuard ( e , gv .asBooleanValue ( ) , false )
77+ or
78+ g .isEquality ( e , _, gv )
7879}
7980
8081/**
8182 * Holds if `n` is bounded in a way that is likely to prevent overflow.
8283 */
8384predicate guardedLessThanSomething ( DataFlow:: Node n ) {
84- DataFlow:: BarrierGuard < sizeGuardLessThan / 3 > :: getABarrierNode ( ) = n
85+ DataFlow:: BarrierGuardValue < sizeGuardLessThan / 3 > :: getABarrierNode ( ) = n
8586 or
8687 negative ( n .asExpr ( ) )
8788 or
@@ -92,7 +93,7 @@ predicate guardedLessThanSomething(DataFlow::Node n) {
9293 * Holds if `e` is bounded in a way that is likely to prevent underflow.
9394 */
9495predicate guardedGreaterThanSomething ( DataFlow:: Node n ) {
95- DataFlow:: BarrierGuard < sizeGuardGreaterThan / 3 > :: getABarrierNode ( ) = n
96+ DataFlow:: BarrierGuardValue < sizeGuardGreaterThan / 3 > :: getABarrierNode ( ) = n
9697 or
9798 positive ( n .asExpr ( ) )
9899 or
0 commit comments