Skip to content

Commit f27e310

Browse files
committed
Java: Adjust references.
1 parent b3bb71f commit f27e310

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ private ControlFlowNode varDereference(SsaVariable v, VarAccess va) {
141141
private ControlFlowNode ensureNotNull(SsaVariable v) {
142142
result = varDereference(v, _)
143143
or
144-
result.asStmt().(AssertStmt).getExpr() = nullGuard(v, true, false)
145-
or
146144
exists(AssertTrueMethod m | result.asCall() = m.getACheck(nullGuard(v, true, false)))
147145
or
148146
exists(AssertFalseMethod m | result.asCall() = m.getACheck(nullGuard(v, false, false)))

java/ql/lib/semmle/code/java/frameworks/Assertions.qll

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,17 @@ predicate assertFail(BasicBlock bb, ControlFlowNode n) {
110110
(
111111
exists(AssertTrueMethod m |
112112
n.asExpr() = m.getACheck(any(BooleanLiteral b | b.getBooleanValue() = false))
113-
) or
113+
)
114+
or
114115
exists(AssertFalseMethod m |
115116
n.asExpr() = m.getACheck(any(BooleanLiteral b | b.getBooleanValue() = true))
116-
) or
117-
exists(AssertFailMethod m | n.asExpr() = m.getACheck()) or
118-
n.asStmt().(AssertStmt).getExpr().(BooleanLiteral).getBooleanValue() = false
117+
)
118+
or
119+
exists(AssertFailMethod m | n.asExpr() = m.getACheck())
120+
or
121+
exists(AssertStmt a |
122+
n.asExpr() = a.getExpr() and
123+
a.getExpr().(BooleanLiteral).getBooleanValue() = false
124+
)
119125
)
120126
}

0 commit comments

Comments
 (0)