4444
4545import cpp
4646private import RangeAnalysisUtils
47- private import semmle.code.cpp.models.interfaces.RangeAnalysisExpr
47+ private import experimental. semmle.code.cpp.models.interfaces.SimpleRangeAnalysisExpr
4848import RangeSSA
4949import SimpleRangeAnalysisCached
5050private import NanAnalysis
@@ -216,7 +216,7 @@ private predicate analyzableExpr(Expr e) {
216216 exists ( e .( RShiftExpr ) .getRightOperand ( ) .getValue ( ) )
217217 or
218218 // A modeled expression for range analysis
219- e instanceof RangeAnalysisExpr
219+ e instanceof SimpleRangeAnalysisExpr
220220 )
221221}
222222
@@ -334,7 +334,7 @@ private predicate exprDependsOnDef(Expr e, RangeSsaDefinition srcDef, StackVaria
334334 e = srcDef .getAUse ( srcVar )
335335 or
336336 // A modeled expression for range analysis
337- exists ( RangeAnalysisExpr rae |
337+ exists ( SimpleRangeAnalysisExpr rae |
338338 rae .dependsOnDef ( srcDef , srcVar )
339339 )
340340}
@@ -738,8 +738,8 @@ private float getLowerBoundsImpl(Expr expr) {
738738 // Use SSA to get the lower bounds for a variable use.
739739 exists ( RangeSsaDefinition def , StackVariable v | expr = def .getAUse ( v ) |
740740 result = getDefLowerBounds ( def , v ) and
741- // Not explicitly modeled by a RangeAnalysisExpr
742- not expr instanceof RangeAnalysisExpr
741+ // Not explicitly modeled by a SimpleRangeAnalysisExpr
742+ not expr instanceof SimpleRangeAnalysisExpr
743743 )
744744 or
745745 // unsigned `&` (tighter bounds may exist)
@@ -757,7 +757,7 @@ private float getLowerBoundsImpl(Expr expr) {
757757 )
758758 or
759759 // A modeled expression for range analysis
760- exists ( RangeAnalysisExpr rangeAnalysisExpr |
760+ exists ( SimpleRangeAnalysisExpr rangeAnalysisExpr |
761761 rangeAnalysisExpr = expr and
762762 result = rangeAnalysisExpr .getLowerBounds ( )
763763 )
@@ -920,8 +920,8 @@ private float getUpperBoundsImpl(Expr expr) {
920920 // Use SSA to get the upper bounds for a variable use.
921921 exists ( RangeSsaDefinition def , StackVariable v | expr = def .getAUse ( v ) |
922922 result = getDefUpperBounds ( def , v ) and
923- // Not explicitly modeled by a RangeAnalysisExpr
924- not expr instanceof RangeAnalysisExpr
923+ // Not explicitly modeled by a SimpleRangeAnalysisExpr
924+ not expr instanceof SimpleRangeAnalysisExpr
925925 )
926926 or
927927 // unsigned `&` (tighter bounds may exist)
@@ -941,7 +941,7 @@ private float getUpperBoundsImpl(Expr expr) {
941941 )
942942 or
943943 // A modeled expression for range analysis
944- exists ( RangeAnalysisExpr rangeAnalysisExpr |
944+ exists ( SimpleRangeAnalysisExpr rangeAnalysisExpr |
945945 rangeAnalysisExpr = expr and
946946 result = rangeAnalysisExpr .getUpperBounds ( )
947947 )
0 commit comments