Merge pull request #6513 from hvitved/csharp/cfg/shared

C#: Make CFG library shared
2026-05-04 05:05:12 +02:00 · 2021-08-31 11:55:43 +02:00
parent cf9ab83dee ab2bc38789
commit c8a5397085
12 changed files with 15513 additions and 5850 deletions
--- a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
@@ -677,7 +677,7 @@
 | Initializers.cs:8:5:8:16 | enter Initializers | Initializers.cs:8:5:8:16 | exit Initializers | 16 |
 | Initializers.cs:10:5:10:16 | enter Initializers | Initializers.cs:10:5:10:16 | exit Initializers | 16 |
 | Initializers.cs:12:10:12:10 | enter M | Initializers.cs:12:10:12:10 | exit M | 22 |
-| Initializers.cs:18:20:18:20 | 1 | Initializers.cs:18:16:18:20 | ... = ... | 2 |
+| Initializers.cs:18:16:18:16 | enter H | Initializers.cs:18:16:18:20 | ... = ... | 3 |
 | Initializers.cs:20:11:20:23 | enter NoConstructor | Initializers.cs:20:11:20:23 | exit NoConstructor | 9 |
 | Initializers.cs:31:9:31:11 | enter Sub | Initializers.cs:31:9:31:11 | exit Sub | 12 |
 | Initializers.cs:33:9:33:11 | enter Sub | Initializers.cs:33:9:33:11 | exit Sub | 9 |
--- a/csharp/ql/test/library-tests/controlflow/graph/Consistency.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Consistency.expected
@@ -1,7 +1,7 @@
-preBasicBlockConsistency
 nonUniqueSetRepresentation
 breakInvariant2
 breakInvariant3
 breakInvariant4
 breakInvariant5
 multipleSuccessors
+preBasicBlockConsistency
--- a/csharp/ql/test/library-tests/controlflow/graph/Consistency.ql
+++ b/csharp/ql/test/library-tests/controlflow/graph/Consistency.ql
@@ -4,6 +4,7 @@ import semmle.code.csharp.controlflow.internal.PreBasicBlocks
 import ControlFlow
 import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl
 import semmle.code.csharp.controlflow.internal.Splitting
+import Consistency

 predicate bbStartInconsistency(ControlFlowElement cfe) {
  exists(ControlFlow::BasicBlock bb | bb.getFirstNode() = cfe.getAControlFlowNode()) and
@@ -49,58 +50,3 @@ query predicate preBasicBlockConsistency(ControlFlowElement cfe1, ControlFlowEle
  bbIntraSuccInconsistency(cfe1, cfe2) and
  s = "intra succ inconsistency"
 }
-
-query predicate nonUniqueSetRepresentation(Splits s1, Splits s2) {
-  forex(Nodes::Split s | s = s1.getASplit() | s = s2.getASplit()) and
-  forex(Nodes::Split s | s = s2.getASplit() | s = s1.getASplit()) and
-  s1 != s2
-}
-
-query predicate breakInvariant2(
-  ControlFlowElement pred, Splits predSplits, ControlFlowElement succ, Splits succSplits,
-  SplitImpl split, Completion c
-) {
-  succSplits(pred, predSplits, succ, succSplits, c) and
-  split = predSplits.getASplit() and
-  split.hasSuccessor(pred, succ, c) and
-  not split = succSplits.getASplit()
-}
-
-query predicate breakInvariant3(
-  ControlFlowElement pred, Splits predSplits, ControlFlowElement succ, Splits succSplits,
-  SplitImpl split, Completion c
-) {
-  succSplits(pred, predSplits, succ, succSplits, c) and
-  split = predSplits.getASplit() and
-  split.hasExit(pred, succ, c) and
-  not split.hasEntry(pred, succ, c) and
-  split = succSplits.getASplit()
-}
-
-query predicate breakInvariant4(
-  ControlFlowElement pred, Splits predSplits, ControlFlowElement succ, Splits succSplits,
-  SplitImpl split, Completion c
-) {
-  succSplits(pred, predSplits, succ, succSplits, c) and
-  split.hasEntry(pred, succ, c) and
-  not split.getKind() = predSplits.getASplit().getKind() and
-  not split = succSplits.getASplit()
-}
-
-query predicate breakInvariant5(
-  ControlFlowElement pred, Splits predSplits, ControlFlowElement succ, Splits succSplits,
-  SplitImpl split, Completion c
-) {
-  succSplits(pred, predSplits, succ, succSplits, c) and
-  split = succSplits.getASplit() and
-  not (split.hasSuccessor(pred, succ, c) and split = predSplits.getASplit()) and
-  not split.hasEntry(pred, succ, c)
-}
-
-query predicate multipleSuccessors(
-  ControlFlow::Node node, SuccessorType t, ControlFlow::Node successor
-) {
-  not node instanceof ControlFlow::Nodes::EntryNode and
-  strictcount(node.getASuccessorByType(t)) > 1 and
-  successor = node.getASuccessorByType(t)
-}
--- a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
@@ -2504,6 +2504,7 @@ dominance
 | Initializers.cs:15:39:15:39 | access to local variable i | Initializers.cs:15:59:15:60 | "" |
 | Initializers.cs:15:42:15:61 | object creation of type Initializers | Initializers.cs:15:37:15:63 | { ..., ... } |
 | Initializers.cs:15:59:15:60 | "" | Initializers.cs:15:42:15:61 | object creation of type Initializers |
+| Initializers.cs:18:16:18:16 | enter H | Initializers.cs:18:20:18:20 | 1 |
 | Initializers.cs:18:20:18:20 | 1 | Initializers.cs:18:16:18:20 | ... = ... |
 | Initializers.cs:20:11:20:23 | enter NoConstructor | Initializers.cs:22:23:22:23 | this access |
 | Initializers.cs:20:11:20:23 | exit NoConstructor (normal) | Initializers.cs:20:11:20:23 | exit NoConstructor |
@@ -6631,6 +6632,7 @@ postDominance
 | Initializers.cs:15:42:15:61 | object creation of type Initializers | Initializers.cs:15:59:15:60 | "" |
 | Initializers.cs:15:59:15:60 | "" | Initializers.cs:15:39:15:39 | access to local variable i |
 | Initializers.cs:18:16:18:20 | ... = ... | Initializers.cs:18:20:18:20 | 1 |
+| Initializers.cs:18:20:18:20 | 1 | Initializers.cs:18:16:18:16 | enter H |
 | Initializers.cs:20:11:20:23 | exit NoConstructor | Initializers.cs:20:11:20:23 | exit NoConstructor (normal) |
 | Initializers.cs:20:11:20:23 | exit NoConstructor (normal) | Initializers.cs:23:23:23:27 | ... = ... |
 | Initializers.cs:22:23:22:23 | this access | Initializers.cs:20:11:20:23 | enter NoConstructor |
@@ -11274,7 +11276,7 @@ blockDominance
 | Initializers.cs:8:5:8:16 | enter Initializers | Initializers.cs:8:5:8:16 | enter Initializers |
 | Initializers.cs:10:5:10:16 | enter Initializers | Initializers.cs:10:5:10:16 | enter Initializers |
 | Initializers.cs:12:10:12:10 | enter M | Initializers.cs:12:10:12:10 | enter M |
-| Initializers.cs:18:20:18:20 | 1 | Initializers.cs:18:20:18:20 | 1 |
+| Initializers.cs:18:16:18:16 | enter H | Initializers.cs:18:16:18:16 | enter H |
 | Initializers.cs:20:11:20:23 | enter NoConstructor | Initializers.cs:20:11:20:23 | enter NoConstructor |
 | Initializers.cs:31:9:31:11 | enter Sub | Initializers.cs:31:9:31:11 | enter Sub |
 | Initializers.cs:33:9:33:11 | enter Sub | Initializers.cs:33:9:33:11 | enter Sub |
@@ -14866,7 +14868,7 @@ postBlockDominance
 | Initializers.cs:8:5:8:16 | enter Initializers | Initializers.cs:8:5:8:16 | enter Initializers |
 | Initializers.cs:10:5:10:16 | enter Initializers | Initializers.cs:10:5:10:16 | enter Initializers |
 | Initializers.cs:12:10:12:10 | enter M | Initializers.cs:12:10:12:10 | enter M |
-| Initializers.cs:18:20:18:20 | 1 | Initializers.cs:18:20:18:20 | 1 |
+| Initializers.cs:18:16:18:16 | enter H | Initializers.cs:18:16:18:16 | enter H |
 | Initializers.cs:20:11:20:23 | enter NoConstructor | Initializers.cs:20:11:20:23 | enter NoConstructor |
 | Initializers.cs:31:9:31:11 | enter Sub | Initializers.cs:31:9:31:11 | enter Sub |
 | Initializers.cs:33:9:33:11 | enter Sub | Initializers.cs:33:9:33:11 | enter Sub |
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.ql
@@ -1,11 +1,9 @@
+/**
+ * @kind graph
+ */
+
 import csharp
 import Common
+import semmle.code.csharp.controlflow.internal.ControlFlowGraphImplShared::TestOutput

-query predicate edges(
-  SourceControlFlowNode node, SourceControlFlowNode successor, string attr, string val
-) {
-  exists(ControlFlow::SuccessorType t | successor = node.getASuccessorByType(t) |
-    attr = "semmle.label" and
-    val = t.toString()
-  )
-}
+private class MyRelevantNode extends RelevantNode, SourceControlFlowNode { }