Shared CFG: Update breakInvariant4 consistency test

hvitved · hvitved · commit 723ac818d959 · 2021-11-15T11:43:49.000+01:00
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll
@@ -924,7 +924,8 @@ module Consistency {
     succSplits(pred, predSplits, succ, succSplits, c) and
     split.hasEntry(pred, succ, c) and
     not split.getKind() = predSplits.getASplit().getKind() and
-    not split = succSplits.getASplit()
+    not split = succSplits.getASplit() and
+    split.getKind().isEnabled(succ)
   }
 
   query predicate breakInvariant5(
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll
@@ -924,7 +924,8 @@ module Consistency {
     succSplits(pred, predSplits, succ, succSplits, c) and
     split.hasEntry(pred, succ, c) and
     not split.getKind() = predSplits.getASplit().getKind() and
-    not split = succSplits.getASplit()
+    not split = succSplits.getASplit() and
+    split.getKind().isEnabled(succ)
   }
 
   query predicate breakInvariant5(

Original file line number	Diff line number	Diff line change
`@@ -924,7 +924,8 @@ module Consistency {`
`924`	`924`	`succSplits(pred, predSplits, succ, succSplits, c) and`
`925`	`925`	`split.hasEntry(pred, succ, c) and`
`926`	`926`	`not split.getKind() = predSplits.getASplit().getKind() and`
`927`		`- not split = succSplits.getASplit()`
	`927`	`+ not split = succSplits.getASplit() and`
	`928`	`+ split.getKind().isEnabled(succ)`
`928`	`929`	`}`
`929`	`930`
`930`	`931`	`query predicate breakInvariant5(`