pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix switch on nullable for Roslyn. Ignore switch on bool because it is indistinguishable from if (bool).

pull/1425/head
Siegfried Pammer 6 years ago
parent
6e49efd5aa
commit
7671ac6fe4
3 changed files with 22 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
  2. 12
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/Switch.cs
  3. 28
      ICSharpCode.Decompiler/IL/Transforms/SwitchOnNullableTransform.cs

1
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
Unescape View File

@ -119,7 +119,6 @@ namespace ICSharpCode.Decompiler.Tests
} }
[Test] [Test]
[Ignore("broken by Roslyn upgrade")]
public void Switch([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions) public void Switch([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions)
{ {
RunForLibrary(cscOptions: cscOptions, decompilerSettings: new DecompilerSettings { RunForLibrary(cscOptions: cscOptions, decompilerSettings: new DecompilerSettings {

12
ICSharpCode.Decompiler.Tests/TestCases/Pretty/Switch.cs
Unescape View File

@ -47,6 +47,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
Null Null
} }
#if !ROSLYN
public static State SwitchOverNullableBool(bool? value) public static State SwitchOverNullableBool(bool? value)
{ {
switch (value) { switch (value) {
@ -60,6 +61,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
} }
#endif
public static bool? SwitchOverNullableEnum(State? state) public static bool? SwitchOverNullableEnum(State? state)
{ {
@ -361,6 +363,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
} }
} }
#if !ROSLYN
public static string SwitchOverBool(bool b) public static string SwitchOverBool(bool b)
{ {
Console.WriteLine("SwitchOverBool: " + b.ToString()); Console.WriteLine("SwitchOverBool: " + b.ToString());
@ -373,6 +376,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
return null; return null;
} }
} }
#endif
public static void SwitchInLoop(int i) public static void SwitchInLoop(int i)
{ {
@ -914,9 +918,9 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
} }
// These decompile poorly into switch statements and should be left as is // These decompile poorly into switch statements and should be left as is
#region Overagressive Switch Use #region Overagressive Switch Use
#if ROSLYN || OPT #if ROSLYN || OPT
public static void SingleIf1(int i, bool a) public static void SingleIf1(int i, bool a)
{ {
if (i == 1 || (i == 2 && a)) { if (i == 1 || (i == 2 && a)) {
@ -924,7 +928,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
} }
Console.WriteLine(2); Console.WriteLine(2);
} }
#endif #endif
public static void SingleIf2(int i, bool a, bool b) public static void SingleIf2(int i, bool a, bool b)
{ {
@ -1067,7 +1071,7 @@ namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
c = getChar(); c = getChar();
} while (c != -1 && c != '\n' && c != '\u2028' && c != '\u2029'); } while (c != -1 && c != '\n' && c != '\u2028' && c != '\u2029');
} }
#endregion #endregion
// Ensure correctness of SwitchDetection.UseCSharpSwitch control flow heuristics // Ensure correctness of SwitchDetection.UseCSharpSwitch control flow heuristics
public static void SwitchWithBreakCase(int i, bool b) public static void SwitchWithBreakCase(int i, bool b)

28
ICSharpCode.Decompiler/IL/Transforms/SwitchOnNullableTransform.cs
Unescape View File

@ -50,10 +50,10 @@ namespace ICSharpCode.Decompiler.IL.Transforms
continue; continue;
} }
if (MatchRoslynSwitchOnNullable(block.Instructions, i, out newSwitch)) { if (MatchRoslynSwitchOnNullable(block.Instructions, i, out newSwitch)) {
newSwitch.AddILRange(block.Instructions[i - 1]); newSwitch.AddILRange(block.Instructions[i]);
block.Instructions[i - 1].ReplaceWith(newSwitch); newSwitch.AddILRange(block.Instructions[i + 1]);
block.Instructions.RemoveRange(i, 2); block.Instructions[i].ReplaceWith(newSwitch);
i--; block.Instructions.RemoveAt(i + 1);
changed = true; changed = true;
continue; continue;
} }
@ -130,18 +130,13 @@ namespace ICSharpCode.Decompiler.IL.Transforms
{ {
newSwitch = null; newSwitch = null;
// match first block: // match first block:
// stloc tmp(ldloc switchValueVar) // if (logic.not(call get_HasValue(target))) br nullCaseBlock
// if (logic.not(call get_HasValue(ldloca tmp))) br nullCaseBlock
// br switchBlock // br switchBlock
if (i < 1) return false; if (!instructions[i].MatchIfInstruction(out var condition, out var trueInst))
if (!instructions[i - 1].MatchStLoc(out var tmp, out var switchValue) ||
!instructions[i].MatchIfInstruction(out var condition, out var trueInst))
return false;
if (tmp.StoreCount != 1 || tmp.AddressCount != 2 || tmp.LoadCount != 0)
return false; return false;
if (!instructions[i + 1].MatchBranch(out var switchBlock) || !trueInst.MatchBranch(out var nullCaseBlock)) if (!instructions[i + 1].MatchBranch(out var switchBlock) || !trueInst.MatchBranch(out var nullCaseBlock))
return false; return false;
if (!condition.MatchLogicNot(out var getHasValue) || !NullableLiftingTransform.MatchHasValueCall(getHasValue, out ILVariable target1) || target1 != tmp) if (!condition.MatchLogicNot(out var getHasValue) || !NullableLiftingTransform.MatchHasValueCall(getHasValue, out ILInstruction target) || !SemanticHelper.IsPure(target.Flags))
return false; return false;
// match second block: switchBlock // match second block: switchBlock
// note: I have seen cases where switchVar is inlined into the switch. // note: I have seen cases where switchVar is inlined into the switch.
@ -161,7 +156,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
if (!switchVar.IsSingleDefinition || switchVar.LoadCount != 1) if (!switchVar.IsSingleDefinition || switchVar.LoadCount != 1)
return false; return false;
if (!NullableLiftingTransform.MatchGetValueOrDefault(getValueOrDefault, tmp)) if (!NullableLiftingTransform.MatchGetValueOrDefault(getValueOrDefault, out ILInstruction target2) && target2.Match(target).Success)
return false; return false;
if (!(switchBlock.Instructions[1] is SwitchInstruction si)) if (!(switchBlock.Instructions[1] is SwitchInstruction si))
return false; return false;
@ -172,7 +167,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
// this is the special case where `call GetValueOrDefault(ldloca tmp)` is inlined into the switch. // this is the special case where `call GetValueOrDefault(ldloca tmp)` is inlined into the switch.
if (!(switchBlock.Instructions[0] is SwitchInstruction si)) if (!(switchBlock.Instructions[0] is SwitchInstruction si))
return false; return false;
if (!NullableLiftingTransform.MatchGetValueOrDefault(si.Value, tmp)) if (!NullableLiftingTransform.MatchGetValueOrDefault(si.Value, out ILInstruction target2) && target2.Match(target).Success)
return false; return false;
switchInst = si; switchInst = si;
break; break;
@ -181,6 +176,11 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
} }
} }
ILInstruction switchValue;
if (target.MatchLdLoca(out var v))
switchValue = new LdLoc(v).WithILRange(target);
else
switchValue = new LdObj(target, ((CallInstruction)getHasValue).Method.DeclaringType);
newSwitch = BuildLiftedSwitch(nullCaseBlock, switchInst, switchValue); newSwitch = BuildLiftedSwitch(nullCaseBlock, switchInst, switchValue);
return true; return true;
} }

Write Preview
Loading…
Cancel
Save