Swift: getImmediateBasicBlockDominator/2 should use immediatelyDominates/0.

d10c · MathiasVP · commit c04654d8f9d4 · 2023-10-24T13:56:31.000+01:00
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -821,7 +821,9 @@ private module CaptureInput implements VariableCapture::InputSig {
     Location getLocation() { result = super.getLocation() }
   }
 
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.(B::BasicBlock).dominates(bb) }
+  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
+    result.(B::BasicBlock).immediatelyDominates(bb)
+  }
 
   BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.(B::BasicBlock).getASuccessor() }
 

Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,9 @@ private module CaptureInput implements VariableCapture::InputSig {`
`821`	`821`	`Location getLocation() { result = super.getLocation() }`
`822`	`822`	`}`
`823`	`823`
`824`		`- BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.(B::BasicBlock).dominates(bb) }`
	`824`	`+ BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {`
	`825`	`+ result.(B::BasicBlock).immediatelyDominates(bb)`
	`826`	`+ }`
`825`	`827`
`826`	`828`	`BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.(B::BasicBlock).getASuccessor() }`
`827`	`829`