hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 16:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17998 from yoff/shared/locations-in-range-analysis

Browse Source
This commit is contained in:
yoff
2025-01-09 14:05:54 +01:00
committed by GitHub
parent 09571135e6 21e7a0e828
commit b263132ab2
11 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/rangeanalysis/codeql/rangeanalysis/ModulusAnalysis.qll
View File

@@ -14,9 +14,9 @@ private import codeql.util.Location
private import RangeAnalysis
module ModulusAnalysis<
LocationSig Location, Semantic Sem, DeltaSig D, BoundSig<Location, Sem, D> Bounds>
LocationSig Location, Semantic<Location> Sem, DeltaSig D, BoundSig<Location, Sem, D> Bounds>
{
private import internal.RangeUtils::MakeUtils<Sem, D>
private import internal.RangeUtils::MakeUtils<Location, Sem, D>
bindingset[pos, v]
pragma[inline_late]

23
shared/rangeanalysis/codeql/rangeanalysis/RangeAnalysis.qll
View File

@@ -65,11 +65,13 @@
private import codeql.util.Location
signature module Semantic {
signature module Semantic<LocationSig Location> {
class Expr {
string toString();
BasicBlock getBasicBlock();
Location getLocation();
}
class ConstantIntegerExpr extends Expr {
@@ -294,7 +296,7 @@ signature module Semantic {
predicate conversionCannotOverflow(Type fromType, Type toType);
}
signature module SignAnalysisSig<Semantic Sem> {
signature module SignAnalysisSig<LocationSig Location, Semantic<Location> Sem> {
/** Holds if `e` can be positive and cannot be negative. */
predicate semPositive(Sem::Expr e);
@@ -320,7 +322,7 @@ signature module SignAnalysisSig<Semantic Sem> {
predicate semMayBeNegative(Sem::Expr e);
}
signature module ModulusAnalysisSig<Semantic Sem> {
signature module ModulusAnalysisSig<LocationSig Location, Semantic<Location> Sem> {
class ModBound;
predicate exprModulus(Sem::Expr e, ModBound b, int val, int mod);
@@ -346,7 +348,7 @@ signature module DeltaSig {
Delta fromFloat(float f);
}
signature module LangSig<Semantic Sem, DeltaSig D> {
signature module LangSig<LocationSig Location, Semantic<Location> Sem, DeltaSig D> {
/**
* Holds if `e >= bound` (if `upper = false`) or `e <= bound` (if `upper = true`).
*/
@@ -372,7 +374,7 @@ signature module LangSig<Semantic Sem, DeltaSig D> {
default predicate includeRelativeBounds() { any() }
}
signature module BoundSig<LocationSig Location, Semantic Sem, DeltaSig D> {
signature module BoundSig<LocationSig Location, Semantic<Location> Sem, DeltaSig D> {
/**
* A bound that the range analysis can infer for a variable. This includes
* constant bounds represented by the abstract value zero, SSA bounds for when
@@ -409,14 +411,15 @@ signature module BoundSig<LocationSig Location, Semantic Sem, DeltaSig D> {
}
}
signature module OverflowSig<Semantic Sem, DeltaSig D> {
signature module OverflowSig<LocationSig Location, Semantic<Location> Sem, DeltaSig D> {
predicate semExprDoesNotOverflow(boolean positively, Sem::Expr expr);
}
module RangeStage<
LocationSig Location, Semantic Sem, DeltaSig D, BoundSig<Location, Sem, D> Bounds,
OverflowSig<Sem, D> OverflowParam, LangSig<Sem, D> LangParam, SignAnalysisSig<Sem> SignAnalysis,
ModulusAnalysisSig<Sem> ModulusAnalysisParam>
LocationSig Location, Semantic<Location> Sem, DeltaSig D, BoundSig<Location, Sem, D> Bounds,
OverflowSig<Location, Sem, D> OverflowParam, LangSig<Location, Sem, D> LangParam,
SignAnalysisSig<Location, Sem> SignAnalysis,
ModulusAnalysisSig<Location, Sem> ModulusAnalysisParam>
{
private import Bounds
private import LangParam
@@ -424,7 +427,7 @@ module RangeStage<
private import OverflowParam
private import SignAnalysis
private import ModulusAnalysisParam
private import internal.RangeUtils::MakeUtils<Sem, D>
private import internal.RangeUtils::MakeUtils<Location, Sem, D>
/**
* An expression that does conversion, boxing, or unboxing

3
shared/rangeanalysis/codeql/rangeanalysis/internal/RangeUtils.qll
View File

@@ -1,6 +1,7 @@
private import codeql.rangeanalysis.RangeAnalysis
private import codeql.util.Location
module MakeUtils<Semantic Lang, DeltaSig D> {
module MakeUtils<LocationSig Location, Semantic<Location> Lang, DeltaSig D> {
private import Lang
/**