Merge pull request #19185 from hvitved/rust/ssa-capture-psudeo-read-dominate

Rust: Fix `capturedCallRead`

Author: hvitved

rust/ql/lib/codeql/rust/dataflow/Ssa.qll

@@ -263,7 +263,7 @@ module Ssa {
         not exists(this.getSplitString()) and
         prefix = ""
       |
-        result = prefix + "phi"
+        result = prefix + SsaImpl::PhiDefinition.super.toString()
       )
     }
 

rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll

@@ -189,7 +189,7 @@ private predicate capturedCallRead(Expr call, BasicBlock bb, int i, Variable v)
     hasCapturedRead(pragma[only_bind_into](v), pragma[only_bind_into](scope)) and
     (
       variableWriteInOuterScope(bb, any(int j | j < i), v, scope) or
-      variableWriteInOuterScope(bb.getAPredecessor+(), _, v, scope)
+      variableWriteInOuterScope(bb.getImmediateDominator+(), _, v, scope)
     ) and
     call = bb.getNode(i).getAstNode()
   )