Skip to content

Shared/Java: Rename ControlFlowReachability library. #20678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

Shared/Java: Rename ControlFlowReachability library. #20678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowReachability.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import csharp
private import codeql.controlflow.ControlFlow
private import codeql.controlflow.ControlFlowReachability
private import semmle.code.csharp.controlflow.BasicBlocks
private import semmle.code.csharp.controlflow.Guards as Guards
private import semmle.code.csharp.ExprOrStmtParent
Expand Down
6 changes: 3 additions & 3 deletions csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private import semmle.code.csharp.controlflow.Guards::AbstractValues
private import semmle.code.csharp.dataflow.internal.SsaImpl as SsaImpl
private import semmle.code.csharp.frameworks.System
private import semmle.code.csharp.frameworks.Test
private import semmle.code.csharp.controlflow.ControlFlowReachability as Cf
private import semmle.code.csharp.controlflow.ControlFlowReachability

private Expr maybeNullExpr(Expr reason) {
G::Internal::nullValue(result) and reason = result
Expand Down Expand Up @@ -260,7 +260,7 @@ private predicate defReaches(Ssa::Definition def, ControlFlow::Node cfn) {
)
}

private module NullnessConfig implements Cf::ControlFlowReachability::ConfigSig {
private module NullnessConfig implements ControlFlowReachability::ConfigSig {
predicate source(ControlFlow::Node node, Ssa::Definition def) { defMaybeNull(def, node, _, _) }

predicate sink(ControlFlow::Node node, Ssa::Definition def) {
Expand All @@ -275,7 +275,7 @@ private module NullnessConfig implements Cf::ControlFlowReachability::ConfigSig
predicate uncertainFlow() { none() }
}

private module NullnessFlow = Cf::ControlFlowReachability::Flow<NullnessConfig>;
private module NullnessFlow = ControlFlowReachability::Flow<NullnessConfig>;

predicate maybeNullDeref(Dereference d, Ssa::SourceVariable v, string msg, Element reason) {
exists(
Expand Down
4 changes: 2 additions & 2 deletions ...mle/code/java/controlflow/ControlFlow.qll → ...a/controlflow/ControlFlowReachability.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ overlay[local?]
module;

import java
private import codeql.controlflow.ControlFlow
private import codeql.controlflow.ControlFlowReachability
private import semmle.code.java.dataflow.SSA as SSA
private import semmle.code.java.controlflow.Guards as Guards

Expand Down Expand Up @@ -57,4 +57,4 @@ private module ControlFlowInput implements InputSig<Location, ControlFlowNode, B
import Guards::Guards_v3::InternalUtil
}

module ControlFlow = Make<Location, Cfg, ControlFlowInput>;
module ControlFlowReachability = Make<Location, Cfg, ControlFlowInput>;
6 changes: 3 additions & 3 deletions java/ql/lib/semmle/code/java/dataflow/Nullness.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ private import IntegerGuards
private import NullGuards
private import semmle.code.java.Collections
private import semmle.code.java.controlflow.internal.Preconditions
private import semmle.code.java.controlflow.ControlFlow as Cf
private import semmle.code.java.controlflow.ControlFlowReachability

/** Gets an expression that may be `null`. */
Expr nullExpr() { result = nullExpr(_) }
Expand Down Expand Up @@ -248,7 +248,7 @@ private predicate impossibleEdge(BasicBlock bb1, BasicBlock bb2) {
)
}

private module NullnessConfig implements Cf::ControlFlow::ConfigSig {
private module NullnessConfig implements ControlFlowReachability::ConfigSig {
predicate source(ControlFlowNode node, SsaVariable def) { varMaybeNull(def, node, _, _) }

predicate sink(ControlFlowNode node, SsaVariable def) { varDereference(def, _) = node }
Expand All @@ -260,7 +260,7 @@ private module NullnessConfig implements Cf::ControlFlow::ConfigSig {
predicate uncertainFlow() { none() }
}

private module NullnessFlow = Cf::ControlFlow::Flow<NullnessConfig>;
private module NullnessFlow = ControlFlowReachability::Flow<NullnessConfig>;

/**
* Holds if the dereference of `v` at `va` might be `null`.
Expand Down
0 ...olflow/codeql/controlflow/ControlFlow.qll → ...l/controlflow/ControlFlowReachability.qll
View file
Open in desktop
File renamed without changes.
Loading