hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 09:13:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Java: Replace SsaPhiNode with SsaPhiDefinition.

Browse Source
This commit is contained in:
Anders Schack-Mulligen
2025-11-07 10:32:36 +01:00
parent 3e43c53b9d
commit 35caede859
8 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/ql/lib/semmle/code/java/dataflow/Nullness.qll
View File

@@ -142,7 +142,7 @@ private predicate varMaybeNull(SsaVariable v, ControlFlowNode node, string msg,
msg = "as suggested by $@ null guard" and msg = "as suggested by $@ null guard" and
guardSuggestsVarMaybeNull(e, v) and guardSuggestsVarMaybeNull(e, v) and
node = v.getCfgNode() and node = v.getCfgNode() and
not v instanceof SsaPhiNode and not v instanceof SsaPhiDefinition and
not clearlyNotNull(v) and not clearlyNotNull(v) and
// Comparisons in finally blocks are excluded since missing exception edges in the CFG could otherwise yield FPs. // Comparisons in finally blocks are excluded since missing exception edges in the CFG could otherwise yield FPs.
not exists(TryStmt try | try.getFinally() = e.getEnclosingStmt().getEnclosingStmt*()) and not exists(TryStmt try | try.getFinally() = e.getEnclosingStmt().getEnclosingStmt*()) and

2
java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
View File

@@ -248,7 +248,7 @@ module Sem implements Semantic<Location> {
Expr getAUse() { result = super.getAUse() } Expr getAUse() { result = super.getAUse() }
} }
class SsaPhiNode extends SsaVariable instanceof SSA::SsaPhiNode { class SsaPhiNode extends SsaVariable instanceof SSA::SsaPhiDefinition {
predicate hasInputFromBlock(SsaVariable inp, BasicBlock bb) { super.hasInputFromBlock(inp, bb) } predicate hasInputFromBlock(SsaVariable inp, BasicBlock bb) { super.hasInputFromBlock(inp, bb) }
} }

12
java/ql/lib/semmle/code/java/dataflow/RangeUtils.qll
View File

@@ -30,14 +30,14 @@ predicate eqFlowCond = U::eqFlowCond/5;
* only other input to `phi` is a `null` value. * only other input to `phi` is a `null` value.
* *
* Note that the declared type of `phi` is `SsaVariable` instead of * Note that the declared type of `phi` is `SsaVariable` instead of
* `SsaPhiNode` in order for the reflexive case of `nonNullSsaFwdStep*(..)` to * `SsaPhiDefinition` in order for the reflexive case of `nonNullSsaFwdStep*(..)` to
* have non-`SsaPhiNode` results. * have non-`SsaPhiDefinition` results.
*/ */
private predicate nonNullSsaFwdStep(SsaVariable v, SsaVariable phi) { private predicate nonNullSsaFwdStep(SsaVariable v, SsaVariable phi) {
exists(SsaExplicitWrite vnull, SsaPhiNode phi0 | phi0 = phi | exists(SsaExplicitWrite vnull, SsaPhiDefinition phi0 | phi0 = phi |
2 = strictcount(phi0.getAPhiInput()) and 2 = strictcount(phi0.getAnInput()) and
vnull = phi0.getAPhiInput() and vnull = phi0.getAnInput() and
v = phi0.getAPhiInput() and v = phi0.getAnInput() and
not backEdge(phi0, v, _) and not backEdge(phi0, v, _) and
vnull != v and vnull != v and
vnull.getValue() instanceof NullLiteral vnull.getValue() instanceof NullLiteral

16
java/ql/lib/semmle/code/java/dataflow/SSA.qll
View File

@@ -381,12 +381,20 @@ class SsaImplicitInit extends SsaVariable instanceof WriteDefinition {
} }
} }
/** An SSA phi node. */ /**
class SsaPhiNode extends SsaVariable instanceof PhiNode { * DEPRECATED: Use `SsaPhiDefinition` instead.
*
* An SSA phi node.
*/
deprecated class SsaPhiNode extends SsaVariable instanceof PhiNode {
override string toString() { result = "SSA phi(" + this.getSourceVariable() + ")" } override string toString() { result = "SSA phi(" + this.getSourceVariable() + ")" }
/** Gets an input to the phi node defining the SSA variable. */ /**
SsaVariable getAPhiInput() { this.hasInputFromBlock(result, _) } * DEPRECATED: Use `getAnInput()` instead.
*
* Gets an input to the phi node defining the SSA variable.
*/
deprecated SsaVariable getAPhiInput() { this.hasInputFromBlock(result, _) }
/** Gets an input to the phi node defining the SSA variable. */ /** Gets an input to the phi node defining the SSA variable. */
SsaVariable getAnInput() { this.hasInputFromBlock(result, _) } SsaVariable getAnInput() { this.hasInputFromBlock(result, _) }

2
java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
View File

@@ -13,7 +13,7 @@ module Private {
class SsaVariable = Ssa::SsaVariable; class SsaVariable = Ssa::SsaVariable;
class SsaPhiNode = Ssa::SsaPhiNode; class SsaPhiNode = Ssa::SsaPhiDefinition;
class Expr = J::Expr; class Expr = J::Expr;

2
java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
View File

@@ -19,7 +19,7 @@ module Private {
class SsaVariable = Ssa::SsaVariable; class SsaVariable = Ssa::SsaVariable;
class SsaPhiNode = Ssa::SsaPhiNode; class SsaPhiNode = Ssa::SsaPhiDefinition;
class VarAccess = J::VarAccess; class VarAccess = J::VarAccess;

2
java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
View File

@@ -10,7 +10,7 @@ private import SsaReadPositionCommon
class SsaVariable = Ssa::SsaVariable; class SsaVariable = Ssa::SsaVariable;
class SsaPhiNode = Ssa::SsaPhiNode; class SsaPhiNode = Ssa::SsaPhiDefinition;
class BasicBlock = BB::BasicBlock; class BasicBlock = BB::BasicBlock;

6
java/ql/test/library-tests/ssa/ssaPhi.ql
View File

@@ -1,6 +1,6 @@
import java import java
import semmle.code.java.dataflow.SSA import semmle.code.java.dataflow.SSA
from SsaPhiNode ssa, SsaSourceVariable v, SsaVariable phiInput from SsaPhiDefinition ssa, SsaSourceVariable v, SsaDefinition phiInput
where ssa.getAPhiInput() = phiInput and ssa.getSourceVariable() = v where ssa.getAnInput() = phiInput and ssa.getSourceVariable() = v
select v, ssa.getCfgNode(), phiInput.getCfgNode() select v, ssa.getControlFlowNode(), phiInput.getControlFlowNode()