Include first step from SsaVariableCapture

Author: owen-mc

go/ql/lib/semmle/go/dataflow/SSA.qll

@@ -154,6 +154,8 @@ class SsaDefinition extends TSsaDefinition {
   abstract predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   );
+
+  IR::Instruction getAFirstUse() { firstUse(this, result) }
 }
 
 /**
@@ -187,8 +189,6 @@ class SsaExplicitDefinition extends SsaDefinition, TExplicitDef {
   ) {
     this.getInstruction().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
-
-  IR::Instruction getAFirstUse() { firstUse(this, result) }
 }
 
 /** Provides a helper predicate for working with explicit SSA definitions. */

go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll

@@ -82,7 +82,8 @@ predicate basicLocalFlowStep(Node nodeFrom, Node nodeTo) {
   )
   or
   // SSA defn -> first SSA use
-  exists(SsaExplicitDefinition pred, IR::Instruction succ | succ = pred.getAFirstUse() |
+  exists(SsaDefinition pred, IR::Instruction succ | succ = pred.getAFirstUse() |
+    (pred instanceof SsaExplicitDefinition or pred instanceof SsaVariableCapture) and
     nodeFrom = ssaNode(pred.getVariable()) and
     nodeTo = instructionNode(succ)
   )