From edcf4931d0762d55f1dc49dfda1b3c29f97ca5c5 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sat, 20 Apr 2019 15:46:26 +0200
Subject: [PATCH] Fix #1489: ArgumentNullException in
 SwitchOnStringTransform.SimplifyCascadingIfStatements

---
 .../IL/Transforms/SwitchOnStringTransform.cs                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs
index 7f719d9e0..daac91f3b 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs
@@ -179,7 +179,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 
 				// Newer versions of Roslyn use extra variables:
 				if (i >= 2 && switchValue.MatchLdLoc(out var otherSwitchValueVar) && otherSwitchValueVar.IsSingleDefinition && otherSwitchValueVar.LoadCount == 1
-					&& instructions[i - 2].MatchStLoc(otherSwitchValueVar, out switchValue)) {
+					&& instructions[i - 2].MatchStLoc(otherSwitchValueVar, out var newSwitchValue)) {
+					switchValue = newSwitchValue;
 					extraLoad = true;
 				}
 			} else if (instructions[i - 1] is StLoc stloc) {