Fix #1338: KeyNotFoundException in SwitchDetection.AnalyzeControlFlow()

icsharpcode · Dec 16, 2018 · b5ab8a4 · b5ab8a4
1 parent 1cd63f7
commit b5ab8a4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs b/ICSharpCode.Decompiler/IL/ControlFlow/SwitchDetection.cs
@@ -350,9 +350,11 @@ private bool MatchRoslynSwitchOnString()
 				if (!s.Value.MatchBranch(out var block)) 
 					continue;
 
-				var node = controlFlowGraph.GetNode(block);
-				if (!loopContext.MatchContinue(node))
-					caseNodes.Add(node);
+				if (block.Parent == currentContainer) {
+					var node = controlFlowGraph.GetNode(block);
+					if (!loopContext.MatchContinue(node))
+						caseNodes.Add(node);
+				}
 			}
 
 			AddNullCase(flowNodes, caseNodes);