From 283d6efdf8d92e2abb4a2ab580155a225a3fe6a4 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Wed, 25 Oct 2023 14:06:35 +0200
Subject: [PATCH] Rangeanalysis/Java/C++: Address some ql4ql findings.

---
 .../semantic/analysis/SignAnalysisCommon.qll       |  4 ++--
 .../semmle/code/java/dataflow/RangeAnalysis.qll    | 14 +++++++-------
 .../codeql/rangeanalysis/RangeAnalysis.qll         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/SignAnalysisCommon.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/SignAnalysisCommon.qll
index 26e72d33e72..20ada012c2a 100644
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/SignAnalysisCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/new/internal/semantic/analysis/SignAnalysisCommon.qll
@@ -511,13 +511,13 @@ module SignAnalysis<DeltaSig D, UtilSig<Sem, D> Utils> {
 
   /**
    * Holds if `e` may have positive values. This does not rule out the
-   * possibilty for negative values.
+   * possibility for negative values.
    */
   predicate semMayBePositive(SemExpr e) { semExprSign(e) = TPos() }
 
   /**
    * Holds if `e` may have negative values. This does not rule out the
-   * possibilty for positive values.
+   * possibility for positive values.
    */
   predicate semMayBeNegative(SemExpr e) { semExprSign(e) = TNeg() }
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
index cd7a2c9c6e6..2b2b539d548 100644
--- a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
@@ -81,7 +81,7 @@ module Sem implements Semantic {
   private import java as J
   private import SSA as SSA
   private import RangeUtils as RU
-  private import semmle.code.java.dataflow.internal.rangeanalysis.SsaReadPositionCommon as SSAReadPos
+  private import semmle.code.java.dataflow.internal.rangeanalysis.SsaReadPositionCommon as SsaReadPos
   private import semmle.code.java.controlflow.internal.GuardsLogic as GL
 
   class Expr = J::Expr;
@@ -230,18 +230,18 @@ module Sem implements Semantic {
 
   class SsaExplicitUpdate extends SsaVariable instanceof SSA::SsaExplicitUpdate { }
 
-  final private class FinalSsaReadPosition = SSAReadPos::SsaReadPosition;
+  final private class FinalSsaReadPosition = SsaReadPos::SsaReadPosition;
 
   class SsaReadPosition extends FinalSsaReadPosition {
     predicate hasReadOfVar(SsaVariable v) { super.hasReadOfVar(v) }
   }
 
-  class SsaReadPositionPhiInputEdge extends SsaReadPosition instanceof SSAReadPos::SsaReadPositionPhiInputEdge
+  class SsaReadPositionPhiInputEdge extends SsaReadPosition instanceof SsaReadPos::SsaReadPositionPhiInputEdge
   {
     predicate phiInput(SsaPhiNode phi, SsaVariable inp) { super.phiInput(phi, inp) }
   }
 
-  class SsaReadPositionBlock extends SsaReadPosition instanceof SSAReadPos::SsaReadPositionBlock {
+  class SsaReadPositionBlock extends SsaReadPosition instanceof SsaReadPos::SsaReadPositionBlock {
     BasicBlock getBlock() { result = super.getBlock() }
   }
 
@@ -374,7 +374,7 @@ module JavaLangImpl implements LangSig<Sem, IntDelta> {
 
 module Utils implements UtilSig<Sem, IntDelta> {
   private import RangeUtils as RU
-  private import semmle.code.java.dataflow.internal.rangeanalysis.SsaReadPositionCommon as SSAReadPos
+  private import semmle.code.java.dataflow.internal.rangeanalysis.SsaReadPositionCommon as SsaReadPos
 
   Sem::Expr semSsaRead(Sem::SsaVariable v, int delta) { result = RU::ssaRead(v, delta) }
 
@@ -399,10 +399,10 @@ module Utils implements UtilSig<Sem, IntDelta> {
   predicate rankedPhiInput(
     Sem::SsaPhiNode phi, Sem::SsaVariable inp, Sem::SsaReadPositionPhiInputEdge edge, int r
   ) {
-    SSAReadPos::rankedPhiInput(phi, inp, edge, r)
+    SsaReadPos::rankedPhiInput(phi, inp, edge, r)
   }
 
-  predicate maxPhiInputRank(Sem::SsaPhiNode phi, int rix) { SSAReadPos::maxPhiInputRank(phi, rix) }
+  predicate maxPhiInputRank(Sem::SsaPhiNode phi, int rix) { SsaReadPos::maxPhiInputRank(phi, rix) }
 }
 
 module Bounds implements BoundSig<Location, Sem, IntDelta> {
diff --git a/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll b/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
index b9ac86b3d3b..50c0130ffcd 100644
--- a/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
+++ b/shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
@@ -202,13 +202,13 @@ signature module SignAnalysisSig<Semantic Sem> {
 
   /**
    * Holds if `e` may have positive values. This does not rule out the
-   * possibilty for negative values.
+   * possibility for negative values.
    */
   predicate semMayBePositive(Sem::Expr e);
 
   /**
    * Holds if `e` may have negative values. This does not rule out the
-   * possibilty for positive values.
+   * possibility for positive values.
    */
   predicate semMayBeNegative(Sem::Expr e);
 }