@@ -260,7 +260,7 @@ module RangeAnalysis {
260260 }
261261
262262 /**
263- * Holds if the given comparison can be modeled as `A <op> B + bias` where `<op>` is the comparison operator,
263+ * Holds if the given ` comparison` can be modeled as `A <op> B + bias` where `<op>` is the comparison operator,
264264 * and `A` is `a * asign` and likewise `B` is `b * bsign`.
265265 */
266266 predicate linearComparison (
@@ -310,18 +310,18 @@ module RangeAnalysis {
310310 * Holds if `guard` asserts that the outcome of `A <op> B + bias` is true, where `<op>` is a comparison operator.
311311 */
312312 predicate linearComparisonGuard (
313- ConditionGuardNode guard , DataFlow:: Node a , int asign , string operator , DataFlow:: Node b ,
314- int bsign , Bias bias
313+ ConditionGuardNode guard , DataFlow:: Node a , int asign , string op , DataFlow:: Node b , int bsign ,
314+ Bias bias
315315 ) {
316316 exists ( Comparison compare |
317317 compare = guard .getTest ( ) .flow ( ) .getImmediatePredecessor * ( ) .asExpr ( ) and
318318 linearComparison ( compare , a , asign , b , bsign , bias ) and
319319 (
320- guard .getOutcome ( ) = true and operator = compare .getOperator ( )
320+ guard .getOutcome ( ) = true and op = compare .getOperator ( )
321321 or
322322 not hasNaNIndicator ( guard .getContainer ( ) ) and
323323 guard .getOutcome ( ) = false and
324- operator = negateOperator ( compare .getOperator ( ) )
324+ op = negateOperator ( compare .getOperator ( ) )
325325 )
326326 )
327327 }
@@ -657,13 +657,13 @@ module RangeAnalysis {
657657 */
658658 pragma [ noopt]
659659 private predicate reachableByNegativeEdges (
660- DataFlow:: Node a , int asign , DataFlow:: Node b , int bsign , ControlFlowNode cfg
660+ DataFlow:: Node src , int asign , DataFlow:: Node dst , int bsign , ControlFlowNode cfg
661661 ) {
662- negativeEdge ( a , asign , b , bsign , cfg )
662+ negativeEdge ( src , asign , dst , bsign , cfg )
663663 or
664664 exists ( DataFlow:: Node mid , int midx , ControlFlowNode midcfg |
665- reachableByNegativeEdges ( a , asign , mid , midx , cfg ) and
666- negativeEdge ( mid , midx , b , bsign , midcfg ) and
665+ reachableByNegativeEdges ( src , asign , mid , midx , cfg ) and
666+ negativeEdge ( mid , midx , dst , bsign , midcfg ) and
667667 exists ( BasicBlock bb , int i , int j |
668668 bb .getNode ( i ) = midcfg and
669669 bb .getNode ( j ) = cfg and
@@ -676,8 +676,8 @@ module RangeAnalysis {
676676 DataFlow:: Node mid , int midx , ControlFlowNode midcfg , BasicBlock midBB ,
677677 ReachableBasicBlock midRBB , BasicBlock cfgBB
678678 |
679- reachableByNegativeEdges ( a , asign , mid , midx , cfg ) and
680- negativeEdge ( mid , midx , b , bsign , midcfg ) and
679+ reachableByNegativeEdges ( src , asign , mid , midx , cfg ) and
680+ negativeEdge ( mid , midx , dst , bsign , midcfg ) and
681681 midBB = midcfg .getBasicBlock ( ) and
682682 midRBB = midBB .( ReachableBasicBlock ) and
683683 cfgBB = cfg .getBasicBlock ( ) and
0 commit comments