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

Merge pull request #4246 from RasmusWL/java-fix-ssa-varBlockReaches

Browse Source 
Java: Minor fixup for SSA AdjacentUsesImpl::varBlockReaches
This commit is contained in:
Anders Schack-Mulligen
2020-09-21 13:28:20 +02:00
committed by GitHub
parent 016e6d2001 233dd43635
commit 4a3118b13e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/ql/src/semmle/code/java/dataflow/SSA.qll
View File

@@ -779,7 +779,9 @@ private module SsaImpl {
* between `b1` and `b2`.
*/
private predicate varBlockReaches(TrackedVar v, BasicBlock b1, BasicBlock b2) {
varOccursInBlock(v, b1) and b2 = b1.getABBSuccessor()
varOccursInBlock(v, b1) and
b2 = b1.getABBSuccessor() and
blockPrecedesVar(v, b2)
or
exists(BasicBlock mid |
varBlockReaches(v, b1, mid) and

4
java/ql/src/semmle/code/java/dataflow/internal/BaseSSA.qll
View File

@@ -330,7 +330,9 @@ private module SsaImpl {
* between `b1` and `b2`.
*/
private predicate varBlockReaches(BaseSsaSourceVariable v, BasicBlock b1, BasicBlock b2) {
varOccursInBlock(v, b1) and b2 = b1.getABBSuccessor()
varOccursInBlock(v, b1) and
b2 = b1.getABBSuccessor() and
blockPrecedesVar(v, b2)
or
exists(BasicBlock mid |
varBlockReaches(v, b1, mid) and