C#: Fix enclosing DataFlowCallable of ObjectInitMethods with multiple bodies.

Author: aschackmull

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowDispatch.qll

@@ -27,14 +27,20 @@ newtype TReturnKind =
 
 private predicate hasMultipleSourceLocations(Callable c) { strictcount(getASourceLocation(c)) > 1 }
 
+private predicate objectInitEntry(ObjectInitMethod m, ControlFlowElement first) {
+  exists(ControlFlow::Nodes::EntryNode en |
+    en.getCallable() = m and first.getControlFlowNode() = en.getASuccessor()
+  )
+}
+
 private module NearestBodyLocationInput implements NearestLocationInputSig {
   class C = ControlFlowElement;
 
   predicate relevantLocations(ControlFlowElement body, Location l1, Location l2) {
     exists(Callable c |
       hasMultipleSourceLocations(c) and
       l1 = getASourceLocation(c) and
-      body = c.getBody() and
+      (body = c.getBody() or objectInitEntry(c, body)) and
       l2 = body.getLocation()
     )
   }
@@ -207,7 +213,9 @@ class DataFlowCallable extends TDataFlowCallable {
   private ControlFlow::Nodes::ElementNode getAMultiBodyEntryNode(ControlFlow::BasicBlock bb, int i) {
     this.isMultiBodied() and
     exists(ControlFlowElement body, Location l |
-      body = this.asCallable(l).getBody() and
+      body = this.asCallable(l).getBody() or
+      objectInitEntry(this.asCallable(l), body)
+    |
       NearestLocation<NearestBodyLocationInput>::nearestLocation(body, l, _) and
       result = body.getAControlFlowEntryNode()
     ) and