C#: Fix bad join-orders following stats update

hvitved · hvitved · commit 02ec3253801d · 2020-11-19T10:42:35.000+01:00
diff --git a/csharp/ql/src/semmle/code/cil/DataFlow.qll b/csharp/ql/src/semmle/code/cil/DataFlow.qll
@@ -165,14 +165,16 @@ module DefUse {
     (
       exists(int last | last = max(refRank(bb, _, v, _)) | defReachesRank(bb, vu, last, v))
       or
-      exists(BasicBlock pred |
-        pred = bb.getAPredecessor() and
-        defReachesEndOfBlock(pred, vu, v) and
-        not exists(refRank(bb, _, v, Write()))
-      )
+      defReachesStartOfBlock(bb, vu, v) and
+      not exists(refRank(bb, _, v, Write()))
     )
   }
 
+  pragma[noinline]
+  private predicate defReachesStartOfBlock(BasicBlock bb, VariableUpdate vu, StackVariable v) {
+    defReachesEndOfBlock(bb.getAPredecessor(), vu, v)
+  }
+
   /**
    * Holds if the variable update `vu` of stack variable `v` reaches `read` in the
    * same basic block without crossing another update of `v`.
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/src/semmle/code/csharp/dataflow/SSA.qll
@@ -1130,7 +1130,7 @@ module Ssa {
         exists(Expr mid | reachesDelegateCall(mid) | delegateFlowStep(e, mid))
       }
 
-      pragma[noinline]
+      pragma[nomagic]
       private predicate delegateFlowStepReaches(Expr pred, Expr succ) {
         delegateFlowStep(pred, succ) and
         reachesDelegateCall(succ)

Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ module Ssa {`
`1130`	`1130`	`exists(Expr mid \| reachesDelegateCall(mid) \| delegateFlowStep(e, mid))`
`1131`	`1131`	`}`
`1132`	`1132`
`1133`		`- pragma[noinline]`
	`1133`	`+ pragma[nomagic]`
`1134`	`1134`	`private predicate delegateFlowStepReaches(Expr pred, Expr succ) {`
`1135`	`1135`	`delegateFlowStep(pred, succ) and`
`1136`	`1136`	`reachesDelegateCall(succ)`