Merge pull request #7130 from hvitved/cfg/dead-end-consistency

hvitved · web-flow · commit 47fd64fc4445 · 2021-11-19T13:49:53.000+01:00
Shared CFG: Add "dead end" consistency query
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImplShared.qll
@@ -943,4 +943,9 @@ module Consistency {
     strictcount(getASuccessor(node, t)) > 1 and
     successor = getASuccessor(node, t)
   }
+
+  query predicate deadEnd(Node node) {
+    not node instanceof TExitNode and
+    not exists(getASuccessor(node, _))
+  }
 }
diff --git a/csharp/ql/test/library-tests/controlflow/splits/CONSISTENCY/CfgConsistency.expected b/csharp/ql/test/library-tests/controlflow/splits/CONSISTENCY/CfgConsistency.expected
@@ -0,0 +1,3 @@
+deadEnd
+| SplittingStressTest.cs:95:13:95:14 | [b5 (line 3): false] access to parameter b5 |
+| SplittingStressTest.cs:95:13:95:14 | [b5 (line 3): true] access to parameter b5 |
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplShared.qll
@@ -943,4 +943,9 @@ module Consistency {
     strictcount(getASuccessor(node, t)) > 1 and
     successor = getASuccessor(node, t)
   }
+
+  query predicate deadEnd(Node node) {
+    not node instanceof TExitNode and
+    not exists(getASuccessor(node, _))
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -943,4 +943,9 @@ module Consistency {`
`943`	`943`	`strictcount(getASuccessor(node, t)) > 1 and`
`944`	`944`	`successor = getASuccessor(node, t)`
`945`	`945`	`}`
	`946`	`+`
	`947`	`+ query predicate deadEnd(Node node) {`
	`948`	`+ not node instanceof TExitNode and`
	`949`	`+ not exists(getASuccessor(node, _))`
	`950`	`+ }`
`946`	`951`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+deadEnd`
	`2`	`+\| SplittingStressTest.cs:95:13:95:14 \| [b5 (line 3): false] access to parameter b5 \|`
	`3`	`+\| SplittingStressTest.cs:95:13:95:14 \| [b5 (line 3): true] access to parameter b5 \|`