fix tests and check if captureId exists in the dictionary

SonarSource · Jun 19, 2024 · fe97fcd · fe97fcd
1 parent d4a526c
commit fe97fcd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/analyzers/src/SonarAnalyzer.CFG/LiveVariableAnalysis/RoslynLiveVariableAnalysis.cs b/analyzers/src/SonarAnalyzer.CFG/LiveVariableAnalysis/RoslynLiveVariableAnalysis.cs
@@ -222,13 +222,15 @@ public void ProcessBlock(ControlFlowGraph cfg, BasicBlock block)
             foreach (var op in block.OperationsAndBranchValue.ToReversedExecutionOrder())
             {
                 var operation = op.Instance;
-                if (IFlowCaptureOperationWrapper.IsInstance(operation))
+                if (IFlowCaptureOperationWrapper.IsInstance(operation)
+                    && FlowCaptureOperations.TryGetValue(IFlowCaptureOperationWrapper.FromOperation(operation).Id, out var captureOperations))
                 {
-                    FlowCaptureOperations[IFlowCaptureOperationWrapper.FromOperation(operation).Id].ForEach(x => ProcessOperation(cfg, x));
+                    captureOperations.ForEach(x => ProcessOperation(cfg, x));
                 }
-                else if (IFlowCaptureReferenceOperationWrapper.IsInstance(operation))
+                else if (IFlowCaptureReferenceOperationWrapper.IsInstance(operation)
+                    && FlowCaptureOperations.TryGetValue(IFlowCaptureReferenceOperationWrapper.FromOperation(operation).Id, out captureOperations))
                 {
-                    FlowCaptureOperations[IFlowCaptureReferenceOperationWrapper.FromOperation(operation).Id].ForEach(x => ProcessOperation(cfg, x));
+                    captureOperations.ForEach(x => ProcessOperation(cfg, x));
                 }
                 else
                 {

diff --git a/...s/SonarAnalyzer.Test/LiveVariableAnalysis/RoslynLiveVariableAnalysisTest.LocalFunction.cs b/...s/SonarAnalyzer.Test/LiveVariableAnalysis/RoslynLiveVariableAnalysisTest.LocalFunction.cs
@@ -256,8 +256,8 @@ int LocalFunction(int arg)
         var context = CreateContextCS(code, "LocalFunction");
         context.ValidateEntry(LiveIn("arg"), LiveOut("arg"));
         context.Validate("variable", LiveIn("arg"), LiveOut("arg"));
-        context.Validate("LocalFunction(arg - 1)", LiveIn("arg"));
-        context.Validate("0");
+        context.Validate("LocalFunction(arg - 1)", LiveIn("arg"), LiveOut("arg"));
+        context.Validate("0", LiveIn("arg"), LiveOut("arg"));
     }
 
     [TestMethod]