Reducing duplication

SonarSource · Jul 18, 2024 · aa051f6 · aa051f6
1 parent 5a6a494
commit aa051f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/analyzers/src/SonarAnalyzer.CFG/CfgSerializer/CfgSerializer.RoslynLvaWalker.cs b/analyzers/src/SonarAnalyzer.CFG/CfgSerializer/CfgSerializer.RoslynLvaWalker.cs
@@ -36,26 +36,11 @@ public RoslynLvaWalker(RoslynLiveVariableAnalysis lva, DotWriter writer, RoslynC
 
         protected override void WriteEdges(BasicBlock block)
         {
-            var lvaPredecessors = lva.BlockPredecessors[block.Ordinal];
-            foreach (var predecessor in block.Predecessors)
-            {
-                var condition = string.Empty;
-                if (predecessor.Source.ConditionKind != ControlFlowConditionKind.None)
-                {
-                    condition = predecessor == predecessor.Source.ConditionalSuccessor ? predecessor.Source.ConditionKind.ToString() : "Else";
-                }
-                var semantics = predecessor.Semantics == ControlFlowBranchSemantics.Regular ? null : predecessor.Semantics.ToString();
-                writer.WriteEdge(BlockId(predecessor.Source), BlockId(block), $"{semantics} {condition}".Trim());
-                lvaPredecessors.Remove(predecessor.Source);
-            }
-            foreach (var predecessor in lvaPredecessors)
+            foreach (var predecessor in lva.BlockPredecessors[block.Ordinal].Where(x => !block.Predecessors.Any(y => y.Source == x)))
             {
                 writer.WriteEdge(BlockId(predecessor), BlockId(block), "LVA");
             }
-            if (block.FallThroughSuccessor is { Destination: null })
-            {
-                writer.WriteEdge(BlockId(block), "NoDestination_" + BlockId(block), block.FallThroughSuccessor.Semantics.ToString());
-            }
+            base.WriteEdges(block);
         }
     }
 }
diff --git a/analyzers/tests/SonarAnalyzer.Test/CFG/Roslyn/RoslynLvaSerializerTest.cs b/analyzers/tests/SonarAnalyzer.Test/CFG/Roslyn/RoslynLvaSerializerTest.cs
@@ -91,10 +91,10 @@ void Use(int v) {}
             cfg0_block3 -> cfg0_block4 [label="LVA"]
             cfg0_block4 -> NoDestination_cfg0_block4 [label="StructuredExceptionHandling"]
             cfg0_block0 -> cfg0_block1
-            cfg0_block2 -> cfg0_block5
-            cfg0_block3 -> cfg0_block5
             cfg0_block4 -> cfg0_block5 [label="LVA"]
             cfg0_block4 -> cfg0_block5 [label="LVA"]
+            cfg0_block2 -> cfg0_block5
+            cfg0_block3 -> cfg0_block5
             }
 
             """);
@@ -166,8 +166,8 @@ void Use(int v) {}
             cfg0_block2 -> cfg0_block4 [label="LVA"]
             cfg0_block4 -> NoDestination_cfg0_block4 [label="StructuredExceptionHandling"]
             cfg0_block0 -> cfg0_block1
-            cfg0_block2 -> cfg0_block5
             cfg0_block4 -> cfg0_block5 [label="LVA"]
+            cfg0_block2 -> cfg0_block5
             }
 
             """);
@@ -275,8 +275,8 @@ void Use(int v) {}
             cfg0_block7 -> NoDestination_cfg0_block7 [label="StructuredExceptionHandling"]
             cfg0_block1 -> cfg0_block2
             cfg0_block0 -> cfg0_block1
-            cfg0_block3 -> cfg0_block8 [label="WhenFalse"]
             cfg0_block7 -> cfg0_block8 [label="LVA"]
+            cfg0_block3 -> cfg0_block8 [label="WhenFalse"]
             }
 
             """);