review comments

Author: BazookaMusic

csharp/ql/lib/semmle/code/csharp/dataflow/Bound.qll

@@ -5,10 +5,28 @@ overlay[local?]
 module;
 
 private import csharp as CS
-private import internal.rangeanalysis.BoundSpecific
-private import internal.rangeanalysis.BoundSpecific as BoundSpecific
+private import semmle.code.csharp.dataflow.SSA::Ssa as Ssa
+private import semmle.code.csharp.dataflow.internal.rangeanalysis.ConstantUtils as CU
+private import semmle.code.csharp.dataflow.internal.rangeanalysis.RangeUtils as RU
+private import semmle.code.csharp.dataflow.internal.rangeanalysis.SsaUtils as SU
 private import codeql.rangeanalysis.Bound as SharedBound
 
-private module BoundImpl = SharedBound::Bound<CS::Location, BoundSpecific::BoundDefs>;
+/** Provides C#-specific definitions for bounds. */
+private module BoundDefs implements SharedBound::BoundDefinitions<CS::Location> {
+  class Type = CS::Type;
 
-import BoundImpl
+  class SsaVariable = SU::SsaVariable;
+
+  class SsaSourceVariable = Ssa::SourceVariable;
+
+  class Expr = CS::ControlFlowNodes::ExprNode;
+
+  class IntegralType = CS::IntegralType;
+
+  class ConstantIntegerExpr = CU::ConstantIntegerExpr;
+
+  /** Holds if `e` is a bound expression and it is not an SSA variable read. */
+  predicate interestingExprBound(Expr e) { CU::systemArrayLengthAccess(e.getExpr()) }
+}
+
+import SharedBound::Bound<CS::Location, BoundDefs>

csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/BoundSpecific.qll

@@ -5,9 +5,30 @@ overlay[local?]
 module;
 
 private import java as J
-private import internal.rangeanalysis.BoundSpecific as BoundSpecific
+private import semmle.code.java.dataflow.SSA as Ssa
+private import semmle.code.java.dataflow.RangeUtils as RU
 private import codeql.rangeanalysis.Bound as SharedBound
 
-private module BoundImpl = SharedBound::Bound<J::Location, BoundSpecific::BoundDefs>;
+private module BoundDefs implements SharedBound::BoundDefinitions<J::Location> {
+  class SsaVariable extends Ssa::SsaDefinition {
+    /** Gets a use of this variable. */
+    Expr getAUse() { result = super.getARead() }
+  }
 
-import BoundImpl
+  class SsaSourceVariable = Ssa::SourceVariable;
+
+  class Type = J::Type;
+
+  class Expr = J::Expr;
+
+  class IntegralType = J::IntegralType;
+
+  class ConstantIntegerExpr = RU::ConstantIntegerExpr;
+
+  /** Holds if `e` is a bound expression and it is not an SSA variable read. */
+  predicate interestingExprBound(Expr e) {
+    e.(J::FieldRead).getField() instanceof J::ArrayLengthField
+  }
+}
+
+import SharedBound::Bound<J::Location, BoundDefs>

java/ql/lib/semmle/code/java/dataflow/Bound.qll

@@ -40,7 +40,7 @@ signature module BoundDefinitions<LocationSig Location> {
 
 /**
  * Provides classes for representing abstract bounds for use in, for example, range analysis.
- *  This is a generic implementation of bounds that relies on language specific modules to provide language-specific definitions of expressions, SSA variables, etc.
+ * This is a generic implementation of bounds that relies on language specific modules to provide language-specific definitions of expressions, SSA variables, etc.
  */
 overlay[local?]
 module Bound<LocationSig Location, BoundDefinitions<Location> Defs> {