Merge branch 'rdmarsh2/stageify-range-analysis' into rdmarsh2/range-analysis-overflow

Author: Robert Marsh

cpp/ql/lib/experimental/semmle/code/cpp/semantic/SemanticBound.qll

@@ -5,7 +5,7 @@
 private import SemanticExpr
 private import SemanticExprSpecific::SemanticExprConfig as Specific
 private import SemanticSSA
-private import semmle.code.cpp.Location // TODO: SemLocation?
+private import SemanticLocation // TODO: SemLocation?
 
 /**
  * A valid base for an expression bound.
@@ -15,7 +15,7 @@ private import semmle.code.cpp.Location // TODO: SemLocation?
 class SemBound instanceof Specific::Bound {
   final string toString() { result = super.toString() }
 
-  final Location getLocation() { result = super.getLocation() }
+  final SemLocation getLocation() { result = super.getLocation() }
 
   final SemExpr getExpr(int delta) { result = Specific::getBoundExpr(this, delta) }
 }

cpp/ql/lib/experimental/semmle/code/cpp/semantic/SemanticLocation.qll

@@ -0,0 +1,23 @@
+private import semmle.code.cpp.Location
+
+class SemLocation instanceof Location {
+  /**
+   * Gets a textual representation of this element.
+   *
+   * The format is "file://filePath:startLine:startColumn:endLine:endColumn".
+   */
+  string toString() { result = super.toString() }
+
+  /**
+   * Holds if this element is at the specified location.
+   * The location spans column `startcolumn` of line `startline` to
+   * column `endcolumn` of line `endline` in file `filepath`.
+   * For more information, see
+   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+   */
+  predicate hasLocationInfo(
+    string filepath, int startline, int startcolumn, int endline, int endcolumn
+  ) {
+    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
+}

cpp/ql/lib/experimental/semmle/code/cpp/semantic/analysis/RangeAnalysisImpl.qll

@@ -3,20 +3,20 @@ private import RangeAnalysisSpecific
 private import experimental.semmle.code.cpp.semantic.analysis.FloatDelta
 private import RangeUtils
 private import experimental.semmle.code.cpp.semantic.SemanticBound as SemanticBound
-private import semmle.code.cpp.ir.IR as IR
-private import semmle.code.cpp.Location // TODO: SemLocation?
+private import experimental.semmle.code.cpp.semantic.SemanticLocation
+private import experimental.semmle.code.cpp.semantic.SemanticSSA
 
 module ConstantBounds implements BoundSig<FloatDelta> {
   class SemBound instanceof SemanticBound::SemBound {
     SemBound() {
       this instanceof SemanticBound::SemZeroBound
       or
-      this.(SemanticBound::SemSsaBound).getExpr(0) instanceof IR::PhiInstruction
+      this.(SemanticBound::SemSsaBound).getAVariable() instanceof SemSsaPhiNode
     }
 
     string toString() { result = super.toString() }
 
-    Location getLocation() { result = super.getLocation() }
+    SemLocation getLocation() { result = super.getLocation() }
 
     SemExpr getExpr(float delta) { result = super.getExpr(delta) }
   }
@@ -30,9 +30,11 @@ module ConstantBounds implements BoundSig<FloatDelta> {
 
 module RelativeBounds implements BoundSig<FloatDelta> {
   class SemBound instanceof SemanticBound::SemBound {
+    SemBound() { not this instanceof SemanticBound::SemZeroBound }
+
     string toString() { result = super.toString() }
 
-    Location getLocation() { result = super.getLocation() }
+    SemLocation getLocation() { result = super.getLocation() }
 
     SemExpr getExpr(float delta) { result = super.getExpr(delta) }
   }

cpp/ql/lib/experimental/semmle/code/cpp/semantic/analysis/RangeAnalysisStage.qll

@@ -73,7 +73,7 @@ import experimental.semmle.code.cpp.semantic.SemanticCFG
 import experimental.semmle.code.cpp.semantic.SemanticType
 import experimental.semmle.code.cpp.semantic.SemanticOpcode
 private import ConstantAnalysis
-private import semmle.code.cpp.Location
+import experimental.semmle.code.cpp.semantic.SemanticLocation
 
 /**
  * Holds if `typ` is a small integral type with the given lower and upper bounds.
@@ -231,7 +231,7 @@ signature module BoundSig<DeltaSig D> {
   class SemBound {
     string toString();
 
-    Location getLocation();
+    SemLocation getLocation();
 
     SemExpr getExpr(D::Delta delta);
   }

cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.ql

@@ -6,7 +6,6 @@ import experimental.semmle.code.cpp.semantic.analysis.RangeUtils
 import experimental.semmle.code.cpp.semantic.analysis.FloatDelta
 import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisSpecific
 import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisImpl
-import experimental.semmle.code.cpp.semantic.analysis.RangeAnalysisStage
 import semmle.code.cpp.ir.IR as IR
 import TestUtilities.InlineExpectationsTest
 
@@ -25,7 +24,7 @@ module Bounds implements BoundSig<FloatDelta> {
 }
 
 module ModulusAnalysisInstantiated =
-  ModulusAnalysis<FloatDelta, Bounds, RangeUtil<FloatDelta, CppLangImpl>>;
+  ModulusAnalysis<FloatDelta, ConstantBounds, RangeUtil<FloatDelta, CppLangImpl>>;
 
 class ModulusAnalysisTest extends InlineExpectationsTest {
   ModulusAnalysisTest() { this = "ModulusAnalysisTest" }