Merge pull request github#11092 from hvitved/swift/avoid-deprecated-ssa-predicates

MathiasVP · web-flow · commit 01f3150a7064 · 2022-11-03T09:03:47.000Z
Swift: Avoid calls to deprecated SSA predicates
diff --git a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
@@ -101,7 +101,7 @@ module Ssa {
     ControlFlowNode getAFirstRead() {
       exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
         this.definesAt(_, bb1, i1) and
-        SsaImpl::adjacentDefNoUncertainReads(this, bb1, i1, bb2, i2) and
+        SsaImpl::adjacentDefRead(this, bb1, i1, bb2, i2) and
         result = bb2.getNode(i2)
       )
     }
@@ -111,7 +111,7 @@ module Ssa {
       exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
         read1 = bb1.getNode(i1) and
         SsaInput::variableRead(bb1, i1, _, true) and
-        SsaImpl::adjacentDefNoUncertainReads(this, bb1, i1, bb2, i2) and
+        SsaImpl::adjacentDefRead(this, bb1, i1, bb2, i2) and
         read2 = bb2.getNode(i2)
       )
     }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ module Ssa {`
`101`	`101`	`ControlFlowNode getAFirstRead() {`
`102`	`102`	`exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 \|`
`103`	`103`	`this.definesAt(_, bb1, i1) and`
`104`		`- SsaImpl::adjacentDefNoUncertainReads(this, bb1, i1, bb2, i2) and`
	`104`	`+ SsaImpl::adjacentDefRead(this, bb1, i1, bb2, i2) and`
`105`	`105`	`result = bb2.getNode(i2)`
`106`	`106`	`)`
`107`	`107`	`}`
`@@ -111,7 +111,7 @@ module Ssa {`
`111`	`111`	`exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 \|`
`112`	`112`	`read1 = bb1.getNode(i1) and`
`113`	`113`	`SsaInput::variableRead(bb1, i1, _, true) and`
`114`		`- SsaImpl::adjacentDefNoUncertainReads(this, bb1, i1, bb2, i2) and`
	`114`	`+ SsaImpl::adjacentDefRead(this, bb1, i1, bb2, i2) and`
`115`	`115`	`read2 = bb2.getNode(i2)`
`116`	`116`	`)`
`117`	`117`	`}`