Mirror
/
icsharpcode-ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix C# 1.0 switch on string transform and add tests

pull/1143/head
Siegfried Pammer 7 years ago
parent
f7a314b64c
commit
644941d25b
7 changed files with 3837 additions and 46 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. 12
      ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs
  2. 412
      ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Debug.cs
  3. 1425
      ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Debug.il
  4. 412
      ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Release.cs
  5. 1325
      ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Release.il
  6. 7
      ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
  7. 290
      ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs

12
ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs
View File

@ -94,6 +94,18 @@ namespace ICSharpCode.Decompiler.Tests
Run(settings: new DecompilerSettings { RemoveDeadCode = true }); Run(settings: new DecompilerSettings { RemoveDeadCode = true });
} }
[Test]
public void CS1xSwitch_Debug()
{
Run();
}
[Test]
public void CS1xSwitch_Release()
{
Run();
}
[Test, Ignore("?")] [Test, Ignore("?")]
public void FSharpLoops_Debug() public void FSharpLoops_Debug()
{ {

412
ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Debug.cs
View File

@ -0,0 +1,412 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections;
using System.Reflection;
namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
public class Switch
{
public class SetProperty
{
public readonly PropertyInfo Property;
private int _set;
public int Set {
get {
return _set;
}
set {
_set = value;
}
}
public SetProperty(PropertyInfo property)
{
Property = property;
}
}
public enum State
{
False,
True,
Null
}
public static string SparseIntegerSwitch(int i)
{
Console.WriteLine("SparseIntegerSwitch: " + i);
switch (i) {
case -10000000:
return "-10 mln";
case -100:
return "-hundred";
case -1:
return "-1";
case 0:
return "0";
case 1:
return "1";
case 2:
return "2";
case 4:
return "4";
case 100:
return "hundred";
case 10000:
return "ten thousand";
case 10001:
return "ten thousand and one";
case int.MaxValue:
return "int.MaxValue";
default:
return "something else";
}
}
public static void SwitchOverInt(int i)
{
switch (i) {
case 0:
Console.WriteLine("zero");
break;
case 5:
Console.WriteLine("five");
break;
case 10:
Console.WriteLine("ten");
break;
case 15:
Console.WriteLine("fifteen");
break;
case 20:
Console.WriteLine("twenty");
break;
case 25:
Console.WriteLine("twenty-five");
break;
case 30:
Console.WriteLine("thirty");
break;
}
}
public static string ShortSwitchOverString(string text)
{
Console.WriteLine("ShortSwitchOverString: " + text);
switch (text) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case "Third case":
return "Text3";
default:
return "Default";
}
}
public static string ShortSwitchOverStringWithNullCase(string text)
{
Console.WriteLine("ShortSwitchOverStringWithNullCase: " + text);
switch (text) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case null:
return "null";
default:
return "Default";
}
}
public static string SwitchOverString1(string text)
{
Console.WriteLine("SwitchOverString1: " + text);
switch (text) {
case "First case":
return "Text1";
case "Second case":
case "2nd case":
return "Text2";
case "Third case":
return "Text3";
case "Fourth case":
return "Text4";
case "Fifth case":
return "Text5";
case "Sixth case":
return "Text6";
case null:
return null;
default:
return "Default";
}
}
public static string SwitchOverString2()
{
Console.WriteLine("SwitchOverString2:");
switch (Environment.UserName) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case "Third case":
return "Text3";
case "Fourth case":
return "Text4";
case "Fifth case":
return "Text5";
case "Sixth case":
return "Text6";
case "Seventh case":
return "Text7";
case "Eighth case":
return "Text8";
case "Ninth case":
return "Text9";
case "Tenth case":
return "Text10";
case "Eleventh case":
return "Text11";
default:
return "Default";
}
}
public static string TwoDifferentSwitchBlocksInTryFinally()
{
try {
Console.WriteLine("TwoDifferentSwitchBlocks:");
switch (Environment.UserName) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case "Third case":
return "Text3";
case "Fourth case":
return "Text4";
case "Fifth case":
return "Text5";
case "Sixth case":
return "Text6";
case "Seventh case":
return "Text7";
case "Eighth case":
return "Text8";
case "Ninth case":
return "Text9";
case "Tenth case":
return "Text10";
case "Eleventh case":
return "Text11";
default:
return "Default";
}
} finally {
Console.WriteLine("Second switch:");
switch (Console.ReadLine()) {
case "12":
Console.WriteLine("Te43234xt1");
break;
case "13":
Console.WriteLine("Te223443xt2");
break;
case "14":
Console.WriteLine("Te234xt3");
break;
case "15":
Console.WriteLine("Tex243t4");
break;
case "16":
Console.WriteLine("Tex243t5");
break;
case "17":
Console.WriteLine("Text2346");
break;
case "18":
Console.WriteLine("Text234234");
break;
case "19 case":
Console.WriteLine("Text8234");
break;
case "20 case":
Console.WriteLine("Text923423");
break;
case "21 case":
Console.WriteLine("Text10");
break;
case "22 case":
Console.WriteLine("Text1134123");
break;
default:
Console.WriteLine("Defa234234ult");
break;
}
}
}
public static string SwitchOverBool(bool b)
{
Console.WriteLine("SwitchOverBool: " + b.ToString());
switch (b) {
case true:
return bool.TrueString;
case false:
return bool.FalseString;
default:
return null;
}
}
public static void SwitchInLoop(int i)
{
Console.WriteLine("SwitchInLoop: " + i);
while (true) {
switch (i) {
case 1:
Console.WriteLine("one");
break;
case 2:
Console.WriteLine("two");
break;
//case 3:
// Console.WriteLine("three");
// continue;
case 4:
Console.WriteLine("four");
return;
default:
Console.WriteLine("default");
Console.WriteLine("more code");
return;
}
i++;
}
}
public static void SwitchWithGoto(int i)
{
Console.WriteLine("SwitchWithGoto: " + i);
switch (i) {
case 1:
Console.WriteLine("one");
goto default;
case 2:
Console.WriteLine("two");
goto case 3;
case 3:
Console.WriteLine("three");
break;
case 4:
Console.WriteLine("four");
return;
default:
Console.WriteLine("default");
break;
}
Console.WriteLine("End of method");
}
private static SetProperty[] GetProperties()
{
return new SetProperty[0];
}
public static void SwitchOnStringInForLoop()
{
ArrayList arrayList = new ArrayList();
ArrayList arrayList2 = new ArrayList();
SetProperty[] properties = GetProperties();
for (int i = 0; i < properties.Length; i++) {
Console.WriteLine("In for-loop");
SetProperty setProperty = properties[i];
switch (setProperty.Property.Name) {
case "Name1":
setProperty.Set = 1;
arrayList.Add(setProperty);
break;
case "Name2":
setProperty.Set = 2;
arrayList.Add(setProperty);
break;
case "Name3":
setProperty.Set = 3;
arrayList.Add(setProperty);
break;
case "Name4":
setProperty.Set = 4;
arrayList.Add(setProperty);
break;
case "Name5":
case "Name6":
arrayList.Add(setProperty);
break;
default:
arrayList2.Add(setProperty);
break;
}
}
}
public static void SwitchWithComplexCondition(string[] args)
{
switch ((args.Length == 0) ? "dummy" : args[0]) {
case "a":
Console.WriteLine("a");
break;
case "b":
Console.WriteLine("b");
break;
case "c":
Console.WriteLine("c");
break;
case "d":
Console.WriteLine("d");
break;
}
Console.WriteLine("end");
}
public static void SwitchWithArray(string[] args)
{
switch (args[0]) {
case "a":
Console.WriteLine("a");
break;
case "b":
Console.WriteLine("b");
break;
case "c":
Console.WriteLine("c");
break;
case "d":
Console.WriteLine("d");
break;
}
Console.WriteLine("end");
}
}
}

1425
ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Debug.il
File diff suppressed because it is too large
View File

412
ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Release.cs
View File

@ -0,0 +1,412 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
// software and associated documentation files (the "Software"), to deal in the Software
// without restriction, including without limitation the rights to use, copy, modify, merge,
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
// to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or
// substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.Collections;
using System.Reflection;
namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
public class Switch
{
public class SetProperty
{
public readonly PropertyInfo Property;
private int _set;
public int Set {
get {
return _set;
}
set {
_set = value;
}
}
public SetProperty(PropertyInfo property)
{
Property = property;
}
}
public enum State
{
False,
True,
Null
}
public static string SparseIntegerSwitch(int i)
{
Console.WriteLine("SparseIntegerSwitch: " + i);
switch (i) {
case -10000000:
return "-10 mln";
case -100:
return "-hundred";
case -1:
return "-1";
case 0:
return "0";
case 1:
return "1";
case 2:
return "2";
case 4:
return "4";
case 100:
return "hundred";
case 10000:
return "ten thousand";
case 10001:
return "ten thousand and one";
case int.MaxValue:
return "int.MaxValue";
default:
return "something else";
}
}
public static void SwitchOverInt(int i)
{
switch (i) {
case 0:
Console.WriteLine("zero");
break;
case 5:
Console.WriteLine("five");
break;
case 10:
Console.WriteLine("ten");
break;
case 15:
Console.WriteLine("fifteen");
break;
case 20:
Console.WriteLine("twenty");
break;
case 25:
Console.WriteLine("twenty-five");
break;
case 30:
Console.WriteLine("thirty");
break;
}
}
public static string ShortSwitchOverString(string text)
{
Console.WriteLine("ShortSwitchOverString: " + text);
switch (text) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case "Third case":
return "Text3";
default:
return "Default";
}
}
public static string ShortSwitchOverStringWithNullCase(string text)
{
Console.WriteLine("ShortSwitchOverStringWithNullCase: " + text);
switch (text) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case null:
return "null";
default:
return "Default";
}
}
public static string SwitchOverString1(string text)
{
Console.WriteLine("SwitchOverString1: " + text);
switch (text) {
case "First case":
return "Text1";
case "Second case":
case "2nd case":
return "Text2";
case "Third case":
return "Text3";
case "Fourth case":
return "Text4";
case "Fifth case":
return "Text5";
case "Sixth case":
return "Text6";
case null:
return null;
default:
return "Default";
}
}
public static string SwitchOverString2()
{
Console.WriteLine("SwitchOverString2:");
switch (Environment.UserName) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case "Third case":
return "Text3";
case "Fourth case":
return "Text4";
case "Fifth case":
return "Text5";
case "Sixth case":
return "Text6";
case "Seventh case":
return "Text7";
case "Eighth case":
return "Text8";
case "Ninth case":
return "Text9";
case "Tenth case":
return "Text10";
case "Eleventh case":
return "Text11";
default:
return "Default";
}
}
public static string TwoDifferentSwitchBlocksInTryFinally()
{
try {
Console.WriteLine("TwoDifferentSwitchBlocks:");
switch (Environment.UserName) {
case "First case":
return "Text1";
case "Second case":
return "Text2";
case "Third case":
return "Text3";
case "Fourth case":
return "Text4";
case "Fifth case":
return "Text5";
case "Sixth case":
return "Text6";
case "Seventh case":
return "Text7";
case "Eighth case":
return "Text8";
case "Ninth case":
return "Text9";
case "Tenth case":
return "Text10";
case "Eleventh case":
return "Text11";
default:
return "Default";
}
} finally {
Console.WriteLine("Second switch:");
switch (Console.ReadLine()) {
case "12":
Console.WriteLine("Te43234xt1");
break;
case "13":
Console.WriteLine("Te223443xt2");
break;
case "14":
Console.WriteLine("Te234xt3");
break;
case "15":
Console.WriteLine("Tex243t4");
break;
case "16":
Console.WriteLine("Tex243t5");
break;
case "17":
Console.WriteLine("Text2346");
break;
case "18":
Console.WriteLine("Text234234");
break;
case "19 case":
Console.WriteLine("Text8234");
break;
case "20 case":
Console.WriteLine("Text923423");
break;
case "21 case":
Console.WriteLine("Text10");
break;
case "22 case":
Console.WriteLine("Text1134123");
break;
default:
Console.WriteLine("Defa234234ult");
break;
}
}
}
public static string SwitchOverBool(bool b)
{
Console.WriteLine("SwitchOverBool: " + b.ToString());
switch (b) {
case true:
return bool.TrueString;
case false:
return bool.FalseString;
default:
return null;
}
}
public static void SwitchInLoop(int i)
{
Console.WriteLine("SwitchInLoop: " + i);
while (true) {
switch (i) {
case 1:
Console.WriteLine("one");
break;
case 2:
Console.WriteLine("two");
break;
//case 3:
// Console.WriteLine("three");
// continue;
case 4:
Console.WriteLine("four");
return;
default:
Console.WriteLine("default");
Console.WriteLine("more code");
return;
}
i++;
}
}
public static void SwitchWithGoto(int i)
{
Console.WriteLine("SwitchWithGoto: " + i);
switch (i) {
case 1:
Console.WriteLine("one");
goto default;
case 2:
Console.WriteLine("two");
goto case 3;
case 3:
Console.WriteLine("three");
break;
case 4:
Console.WriteLine("four");
return;
default:
Console.WriteLine("default");
break;
}
Console.WriteLine("End of method");
}
private static SetProperty[] GetProperties()
{
return new SetProperty[0];
}
public static void SwitchOnStringInForLoop()
{
ArrayList arrayList = new ArrayList();
ArrayList arrayList2 = new ArrayList();
SetProperty[] properties = GetProperties();
for (int i = 0; i < properties.Length; i++) {
Console.WriteLine("In for-loop");
SetProperty setProperty = properties[i];
switch (setProperty.Property.Name) {
case "Name1":
setProperty.Set = 1;
arrayList.Add(setProperty);
break;
case "Name2":
setProperty.Set = 2;
arrayList.Add(setProperty);
break;
case "Name3":
setProperty.Set = 3;
arrayList.Add(setProperty);
break;
case "Name4":
setProperty.Set = 4;
arrayList.Add(setProperty);
break;
case "Name5":
case "Name6":
arrayList.Add(setProperty);
break;
default:
arrayList2.Add(setProperty);
break;
}
}
}
public static void SwitchWithComplexCondition(string[] args)
{
switch ((args.Length == 0) ? "dummy" : args[0]) {
case "a":
Console.WriteLine("a");
break;
case "b":
Console.WriteLine("b");
break;
case "c":
Console.WriteLine("c");
break;
case "d":
Console.WriteLine("d");
break;
}
Console.WriteLine("end");
}
public static void SwitchWithArray(string[] args)
{
switch (args[0]) {
case "a":
Console.WriteLine("a");
break;
case "b":
Console.WriteLine("b");
break;
case "c":
Console.WriteLine("c");
break;
case "d":
Console.WriteLine("d");
break;
}
Console.WriteLine("end");
}
}
}

1325
ICSharpCode.Decompiler.Tests/TestCases/ILPretty/CS1xSwitch_Release.il
File diff suppressed because it is too large
View File

7
ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
View File

@ -229,6 +229,8 @@ namespace ICSharpCode.Decompiler.CSharp
if (settings.AnonymousTypes && type.IsAnonymousType()) if (settings.AnonymousTypes && type.IsAnonymousType())
return true; return true;
} }
if (settings.ArrayInitializers && settings.SwitchStatementOnString && type.Name.StartsWith("<PrivateImplementationDetails>", StringComparison.Ordinal))
return true;
} }
FieldDefinition field = member as FieldDefinition; FieldDefinition field = member as FieldDefinition;
@ -244,12 +246,15 @@ namespace ICSharpCode.Decompiler.CSharp
// event-fields are not [CompilerGenerated] // event-fields are not [CompilerGenerated]
if (settings.AutomaticEvents && field.DeclaringType.Events.Any(ev => ev.Name == field.Name)) if (settings.AutomaticEvents && field.DeclaringType.Events.Any(ev => ev.Name == field.Name))
return true; return true;
// HACK : only hide fields starting with '__StaticArrayInit'
if (settings.ArrayInitializers && field.DeclaringType.Name.StartsWith("<PrivateImplementationDetails>", StringComparison.Ordinal)) { if (settings.ArrayInitializers && field.DeclaringType.Name.StartsWith("<PrivateImplementationDetails>", StringComparison.Ordinal)) {
// hide fields starting with '__StaticArrayInit'
if (field.Name.StartsWith("__StaticArrayInit", StringComparison.Ordinal)) if (field.Name.StartsWith("__StaticArrayInit", StringComparison.Ordinal))
return true; return true;
if (field.FieldType.Name.StartsWith("__StaticArrayInit", StringComparison.Ordinal)) if (field.FieldType.Name.StartsWith("__StaticArrayInit", StringComparison.Ordinal))
return true; return true;
// hide fields starting with '$$method'
if (field.Name.StartsWith("$$method", StringComparison.Ordinal))
return true;
} }
} }

290
ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs
View File

@ -25,6 +25,8 @@ using ICSharpCode.Decompiler.Util;
namespace ICSharpCode.Decompiler.IL.Transforms namespace ICSharpCode.Decompiler.IL.Transforms
{ {
using HashtableInitializer = Dictionary<IField, (List<(string, int)> Labels, IfInstruction JumpToNext, Block ContainingBlock, Block Previous, Block Next, bool Transformed)>;
/// <summary> /// <summary>
/// Detects switch-on-string patterns employed by the C# compiler and transforms them to an ILAst-switch-instruction. /// Detects switch-on-string patterns employed by the C# compiler and transforms them to an ILAst-switch-instruction.
/// </summary> /// </summary>
@ -35,6 +37,9 @@ namespace ICSharpCode.Decompiler.IL.Transforms
if (!context.Settings.SwitchStatementOnString) if (!context.Settings.SwitchStatementOnString)
return; return;
BlockContainer body = (BlockContainer)function.Body;
var hashtableInitializers = ScanHashtableInitializerBlocks(body.EntryPoint);
HashSet<BlockContainer> changedContainers = new HashSet<BlockContainer>(); HashSet<BlockContainer> changedContainers = new HashSet<BlockContainer>();
foreach (var block in function.Descendants.OfType<Block>()) { foreach (var block in function.Descendants.OfType<Block>()) {
@ -44,7 +49,11 @@ namespace ICSharpCode.Decompiler.IL.Transforms
changed = true; changed = true;
continue; continue;
} }
if (MatchLegacySwitchOnStringWithHashtable(block.Instructions, ref i)) {
if (SimplifyCSharp1CascadingIfStatements(block.Instructions, ref i)) {
changed = true;
continue;
}
if (MatchLegacySwitchOnStringWithHashtable(block, hashtableInitializers, ref i)) {
changed = true; changed = true;
continue; continue;
} }
@ -63,10 +72,83 @@ namespace ICSharpCode.Decompiler.IL.Transforms
changedContainers.Add(container); changedContainers.Add(container);
} }
var omittedBlocks = new Dictionary<Block, Block>();
// Remove all transformed hashtable initializers from the entrypoint.
foreach (var item in hashtableInitializers) {
var (labels, jumpToNext, containingBlock, previous, next, transformed) = item.Value;
if (!transformed) continue;
if (!omittedBlocks.TryGetValue(previous, out var actual))
actual = previous;
if (jumpToNext != null) {
actual.Instructions.SecondToLastOrDefault().ReplaceWith(jumpToNext);
}
actual.Instructions.LastOrDefault().ReplaceWith(new Branch(next));
omittedBlocks.Add(containingBlock, previous);
changedContainers.Add(body);
}
// If all initializer where removed, remove the initial null check as well.
if (hashtableInitializers.Count > 0 && omittedBlocks.Count == hashtableInitializers.Count && body.EntryPoint.Instructions.Count == 2) {
if (body.EntryPoint.Instructions[0] is IfInstruction ifInst
&& ifInst.TrueInst.MatchBranch(out var beginOfMethod) && body.EntryPoint.Instructions[1].MatchBranch(beginOfMethod)) {
body.EntryPoint.Instructions.RemoveAt(0);
}
}
foreach (var container in changedContainers) foreach (var container in changedContainers)
container.SortBlocks(deleteUnreachableBlocks: true); container.SortBlocks(deleteUnreachableBlocks: true);
} }
HashtableInitializer ScanHashtableInitializerBlocks(Block entryPoint)
{
var hashtables = new HashtableInitializer();
if (entryPoint.Instructions.Count != 2)
return hashtables;
// match first block: checking compiler-generated Hashtable for null
// if (comp(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f-1) != ldnull)) br switchHeadBlock
// br tableInitBlock
if (!(entryPoint.Instructions[0].MatchIfInstruction(out var condition, out var branchToSwitchHead)))
return hashtables;
if (!entryPoint.Instructions[1].MatchBranch(out var tableInitBlock))
return hashtables;
if (!(condition.MatchCompNotEquals(out var left, out var right) && right.MatchLdNull() &&
MatchDictionaryFieldLoad(left, IsNonGenericHashtable, out var dictField, out var dictionaryType)))
return hashtables;
if (!branchToSwitchHead.MatchBranch(out var switchHead))
return hashtables;
// match second block: initialization of compiler-generated Hashtable
// stloc table(newobj Hashtable..ctor(ldc.i4 capacity, ldc.f loadFactor))
// call Add(ldloc table, ldstr value, box System.Int32(ldc.i4 index))
// ... more calls to Add ...
// volatile.stobj System.Collections.Hashtable(ldsflda $$method0x600003f - 1, ldloc table)
// br switchHeadBlock
if (tableInitBlock.IncomingEdgeCount != 1 || tableInitBlock.Instructions.Count < 3)
return hashtables;
Block previousBlock = entryPoint;
while (tableInitBlock != null) {
if (!ExtractStringValuesFromInitBlock(tableInitBlock, out var stringValues, out var blockAfterThisInitBlock, dictionaryType, dictField, true))
break;
var nextHashtableInitHead = tableInitBlock.Instructions.SecondToLastOrDefault() as IfInstruction;
hashtables.Add(dictField, (stringValues, nextHashtableInitHead, tableInitBlock, previousBlock, blockAfterThisInitBlock, false));
previousBlock = tableInitBlock;
// if there is another IfInstruction before the end of the block, it might be a jump to the next hashtable init block.
// if (comp(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f-2) != ldnull)) br switchHeadBlock
if (nextHashtableInitHead != null) {
if (!(nextHashtableInitHead.Condition.MatchCompNotEquals(out left, out right) && right.MatchLdNull() &&
MatchDictionaryFieldLoad(left, IsNonGenericHashtable, out var nextDictField, out _)))
break;
if (!nextHashtableInitHead.TrueInst.MatchBranch(switchHead))
break;
tableInitBlock = blockAfterThisInitBlock;
dictField = nextDictField;
} else {
break;
}
}
return hashtables;
}
bool SimplifyCascadingIfStatements(InstructionCollection<ILInstruction> instructions, ref int i) bool SimplifyCascadingIfStatements(InstructionCollection<ILInstruction> instructions, ref int i)
{ {
if (i < 1) return false; if (i < 1) return false;
@ -98,8 +180,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
var otherSwitchValueVar = switchValueVar; var otherSwitchValueVar = switchValueVar;
switchValueVar = stloc.Variable; switchValueVar = stloc.Variable;
if (i >= 2 && instructions[i - 2].MatchStLoc(otherSwitchValueVar, out switchValue) if (i >= 2 && instructions[i - 2].MatchStLoc(otherSwitchValueVar, out switchValue)
&& otherSwitchValueVar.IsSingleDefinition && otherSwitchValueVar.LoadCount == 2)
{
&& otherSwitchValueVar.IsSingleDefinition && otherSwitchValueVar.LoadCount == 2) {
extraLoad = true; extraLoad = true;
} else { } else {
switchValue = new LdLoc(otherSwitchValueVar); switchValue = new LdLoc(otherSwitchValueVar);
@ -148,6 +229,91 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return true; return true;
} }
bool SimplifyCSharp1CascadingIfStatements(InstructionCollection<ILInstruction> instructions, ref int i)
{
if (i < 1) return false;
// match first block:
// stloc switchValueVar(ldloc temp)
// if (comp(ldloc temp == ldnull)) br defaultBlock
// br isInternedBlock
if (!(instructions[i].MatchIfInstruction(out var condition, out var defaultBlockJump)))
return false;
if (!instructions[i + 1].MatchBranch(out var isInternedBlock))
return false;
if (!defaultBlockJump.MatchBranch(out var defaultOrNullBlock))
return false;
if (!(condition.MatchCompEqualsNull(out var tempLoad) && tempLoad.MatchLdLoc(out var temp)))
return false;
if (!(temp.Kind == VariableKind.StackSlot && temp.LoadCount == 2))
return false;
if (!(instructions[i - 1].MatchStLoc(out var switchValueVar, out var switchValue) && switchValue.MatchLdLoc(temp)))
return false;
// match isInternedBlock:
// stloc switchValueVarCopy(call IsInterned(ldloc switchValueVar))
// if (comp(ldloc switchValueVarCopy == ldstr "case1")) br caseBlock1
// br caseHeader2
if (isInternedBlock.IncomingEdgeCount != 1 || isInternedBlock.Instructions.Count != 3)
return false;
if (!(isInternedBlock.Instructions[0].MatchStLoc(out var switchValueVarCopy, out var arg) && IsIsInternedCall(arg as Call, out arg) && arg.MatchLdLoc(switchValueVar)))
return false;
switchValueVar = switchValueVarCopy;
int conditionOffset = 1;
Block currentCaseBlock = isInternedBlock;
List<(string, Block)> values = new List<(string, Block)>();
// each case starts with:
// if (comp(ldloc switchValueVar == ldstr "case label")) br caseBlock
// br currentCaseBlock
while (currentCaseBlock.Instructions[conditionOffset].MatchIfInstruction(out condition, out var caseBlockJump)) {
if (currentCaseBlock.Instructions.Count != conditionOffset + 2)
break;
if (!condition.MatchCompEquals(out var left, out var right))
break;
if (!left.MatchLdLoc(switchValueVar))
break;
if (!right.MatchLdStr(out string value))
break;
if (!caseBlockJump.MatchBranch(out var caseBlock))
break;
if (!currentCaseBlock.Instructions[conditionOffset + 1].MatchBranch(out currentCaseBlock))
break;
conditionOffset = 0;
values.Add((value, caseBlock));
}
// switch contains case null:
if (currentCaseBlock != defaultOrNullBlock) {
values.Add((null, defaultOrNullBlock));
}
var sections = new List<SwitchSection>(values.SelectWithIndex((index, b) => new SwitchSection { Labels = new LongSet(index), Body = new Branch(b.Item2) }));
sections.Add(new SwitchSection { Labels = new LongSet(new LongInterval(0, sections.Count)).Invert(), Body = new Branch(currentCaseBlock) });
var stringToInt = new StringToInt(switchValue, values.SelectArray(item => item.Item1));
var inst = new SwitchInstruction(stringToInt);
inst.Sections.AddRange(sections);
instructions[i].ReplaceWith(inst);
instructions.RemoveAt(i + 1);
instructions.RemoveAt(i - 1);
return true;
}
bool IsIsInternedCall(Call call, out ILInstruction argument)
{
if (call != null
&& call.Method.DeclaringType.IsKnownType(KnownTypeCode.String)
&& call.Method.IsStatic
&& call.Method.Name == "IsInterned"
&& call.Arguments.Count == 1) {
argument = call.Arguments[0];
return true;
}
argument = null;
return false;
}
/// <summary> /// <summary>
/// Each case consists of two blocks: /// Each case consists of two blocks:
/// 1. block: /// 1. block:
@ -235,7 +401,9 @@ namespace ICSharpCode.Decompiler.IL.Transforms
// br switchHeadBlock // br switchHeadBlock
if (dictInitBlock.IncomingEdgeCount != 1 || dictInitBlock.Instructions.Count < 3) if (dictInitBlock.IncomingEdgeCount != 1 || dictInitBlock.Instructions.Count < 3)
return false; return false;
if (!ExtractStringValuesFromInitBlock(dictInitBlock, out var stringValues, tryGetValueBlock, dictionaryType, dictField))
if (!ExtractStringValuesFromInitBlock(dictInitBlock, out var stringValues, out var blockAfterInit, dictionaryType, dictField, false))
return false;
if (tryGetValueBlock != blockAfterInit)
return false; return false;
// match fourth block: TryGetValue on compiler-generated Dictionary<string, int> // match fourth block: TryGetValue on compiler-generated Dictionary<string, int>
// if (logic.not(call TryGetValue(volatile.ldobj System.Collections.Generic.Dictionary`2[[System.String],[System.Int32]](ldsflda $$method0x600000c-1), ldloc switchValueVar, ldloca switchIndexVar))) br defaultBlock // if (logic.not(call TryGetValue(volatile.ldobj System.Collections.Generic.Dictionary`2[[System.String],[System.Int32]](ldsflda $$method0x600000c-1), ldloc switchValueVar, ldloca switchIndexVar))) br defaultBlock
@ -382,9 +550,10 @@ namespace ICSharpCode.Decompiler.IL.Transforms
/// <summary> /// <summary>
/// Matches and extracts values from Add-call sequences. /// Matches and extracts values from Add-call sequences.
/// </summary> /// </summary>
bool ExtractStringValuesFromInitBlock(Block block, out List<(string, int)> values, Block targetBlock, IType dictionaryType, IField dictionaryField)
bool ExtractStringValuesFromInitBlock(Block block, out List<(string, int)> values, out Block blockAfterInit, IType dictionaryType, IField dictionaryField, bool isHashtablePattern)
{ {
values = null; values = null;
blockAfterInit = null;
// stloc dictVar(newobj Dictionary..ctor(ldc.i4 valuesLength)) // stloc dictVar(newobj Dictionary..ctor(ldc.i4 valuesLength))
// -or- // -or-
// stloc dictVar(newobj Hashtable..ctor(ldc.i4 capacity, ldc.f4 loadFactor)) // stloc dictVar(newobj Hashtable..ctor(ldc.i4 capacity, ldc.f4 loadFactor))
@ -414,7 +583,10 @@ namespace ICSharpCode.Decompiler.IL.Transforms
dictType.Equals(dictionaryType) && loadField.MatchLdsFlda(out var dictField) && dictField.Equals(dictionaryField) && dictType.Equals(dictionaryType) && loadField.MatchLdsFlda(out var dictField) && dictField.Equals(dictionaryField) &&
dictVarLoad.MatchLdLoc(dictVar))) dictVarLoad.MatchLdLoc(dictVar)))
return false; return false;
return block.Instructions[i + 2].MatchBranch(targetBlock);
if (isHashtablePattern && block.Instructions[i + 2] is IfInstruction) {
return block.Instructions[i + 3].MatchBranch(out blockAfterInit);
}
return block.Instructions[i + 2].MatchBranch(out blockAfterInit);
} }
/// <summary> /// <summary>
@ -454,48 +626,26 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return true; return true;
} }
bool MatchLegacySwitchOnStringWithHashtable(InstructionCollection<ILInstruction> instructions, ref int i)
bool MatchLegacySwitchOnStringWithHashtable(Block block, HashtableInitializer hashtableInitializers, ref int i)
{ {
// match first block: checking compiler-generated Hashtable for null
// if (comp(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f-1) != ldnull)) br switchHeadBlock
// br tableInitBlock
if (!(instructions[i].MatchIfInstruction(out var condition, out var branchToSwitchHead) && i + 1 < instructions.Count))
return false;
if (!instructions[i + 1].MatchBranch(out var tableInitBlock) || tableInitBlock.IncomingEdgeCount != 1)
return false;
if (!(condition.MatchCompNotEquals(out var left, out var right) && right.MatchLdNull() &&
MatchDictionaryFieldLoad(left, IsNonGenericHashtable, out var dictField, out var dictionaryType)))
return false;
if (!branchToSwitchHead.MatchBranch(out var switchHead))
return false;
// match second block: initialization of compiler-generated Hashtable
// stloc table(newobj Hashtable..ctor(ldc.i4 capacity, ldc.f loadFactor))
// call Add(ldloc table, ldstr value, box System.Int32(ldc.i4 index))
// ... more calls to Add ...
// volatile.stobj System.Collections.Hashtable(ldsflda $$method0x600003f - 1, ldloc table)
// br switchHeadBlock
if (tableInitBlock.IncomingEdgeCount != 1 || tableInitBlock.Instructions.Count < 3)
return false;
if (!ExtractStringValuesFromInitBlock(tableInitBlock, out var stringValues, switchHead, dictionaryType, dictField))
return false;
// match third block: checking switch-value for null
// match first block: checking switch-value for null
// stloc tmp(ldloc switch-value) // stloc tmp(ldloc switch-value)
// stloc switchVariable(ldloc tmp) // stloc switchVariable(ldloc tmp)
// if (comp(ldloc tmp == ldnull)) br nullCaseBlock // if (comp(ldloc tmp == ldnull)) br nullCaseBlock
// br getItemBlock
if (switchHead.Instructions.Count != 4 || switchHead.IncomingEdgeCount != 2)
// br getItemBloc
if (block.Instructions.Count != i + 4)
return false; return false;
if (!switchHead.Instructions[0].MatchStLoc(out var tmp, out var switchValue))
if (!block.Instructions[i].MatchStLoc(out var tmp, out var switchValue))
return false; return false;
if (!switchHead.Instructions[1].MatchStLoc(out var switchVariable, out var tmpLoad) || !tmpLoad.MatchLdLoc(tmp))
if (!block.Instructions[i + 1].MatchStLoc(out var switchVariable, out var tmpLoad) || !tmpLoad.MatchLdLoc(tmp))
return false; return false;
if (!switchHead.Instructions[2].MatchIfInstruction(out condition, out var nullCaseBlockBranch))
if (!block.Instructions[i + 2].MatchIfInstruction(out var condition, out var nullCaseBlockBranch))
return false; return false;
if (!switchHead.Instructions[3].MatchBranch(out var getItemBlock) || !nullCaseBlockBranch.MatchBranch(out var nullCaseBlock))
if (!block.Instructions[i + 3].MatchBranch(out var getItemBlock) || !(nullCaseBlockBranch.MatchBranch(out var nullCaseBlock) || nullCaseBlockBranch is Leave))
return false; return false;
if (!(condition.MatchCompEquals(out left, out right) && right.MatchLdNull() && left.MatchLdLoc(tmp)))
if (!(condition.MatchCompEquals(out var left, out var right) && right.MatchLdNull() && left.MatchLdLoc(tmp)))
return false; return false;
// match fourth block: get_Item on compiler-generated Hashtable
// match second block: get_Item on compiler-generated Hashtable
// stloc tmp2(call get_Item(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f - 1), ldloc switchVariable)) // stloc tmp2(call get_Item(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f - 1), ldloc switchVariable))
// stloc switchVariable(ldloc tmp2) // stloc switchVariable(ldloc tmp2)
// if (comp(ldloc tmp2 == ldnull)) br defaultCaseBlock // if (comp(ldloc tmp2 == ldnull)) br defaultCaseBlock
@ -510,14 +660,17 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
if (!getItemBlock.Instructions[2].MatchIfInstruction(out condition, out var defaultBlockBranch)) if (!getItemBlock.Instructions[2].MatchIfInstruction(out condition, out var defaultBlockBranch))
return false; return false;
if (!getItemBlock.Instructions[3].MatchBranch(out var switchBlock) || !defaultBlockBranch.MatchBranch(out var defaultBlock))
if (!getItemBlock.Instructions[3].MatchBranch(out var switchBlock) || !(defaultBlockBranch.MatchBranch(out var defaultBlock) || defaultBlockBranch is Leave))
return false; return false;
if (!(condition.MatchCompEquals(out left, out right) && right.MatchLdNull() && left.MatchLdLoc(tmp2))) if (!(condition.MatchCompEquals(out left, out right) && right.MatchLdNull() && left.MatchLdLoc(tmp2)))
return false; return false;
if (!(getItemCall.Arguments.Count == 2 && MatchDictionaryFieldLoad(getItemCall.Arguments[0], IsStringToIntDictionary, out var dictField2, out _) && dictField2.Equals(dictField)) &&
getItemCall.Arguments[1].MatchLdLoc(switchVariable2))
if (!(getItemCall.Arguments.Count == 2 && MatchDictionaryFieldLoad(getItemCall.Arguments[0], IsNonGenericHashtable, out var dictField, out _) && getItemCall.Arguments[1].MatchLdLoc(switchVariable)))
return false; return false;
// match fifth block: switch-instruction block
// Check if there is a hashtable init block at the beginning of the method
if (!hashtableInitializers.TryGetValue(dictField, out var info))
return false;
var stringValues = info.Labels;
// match third block: switch-instruction block
// switch (ldobj System.Int32(unbox System.Int32(ldloc switchVariable))) { // switch (ldobj System.Int32(unbox System.Int32(ldloc switchVariable))) {
// case [0..1): br caseBlock1 // case [0..1): br caseBlock1
// ... more cases ... // ... more cases ...
@ -530,7 +683,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
return false; return false;
var sections = new List<SwitchSection>(switchInst.Sections); var sections = new List<SwitchSection>(switchInst.Sections);
// switch contains case null: // switch contains case null:
if (nullCaseBlock != defaultBlock) {
if (!(nullCaseBlockBranch is Leave) && nullCaseBlock != defaultBlock) {
if (!AddNullSection(sections, stringValues, nullCaseBlock)) { if (!AddNullSection(sections, stringValues, nullCaseBlock)) {
return false; return false;
} }
@ -538,8 +691,55 @@ namespace ICSharpCode.Decompiler.IL.Transforms
var stringToInt = new StringToInt(switchValue, stringValues); var stringToInt = new StringToInt(switchValue, stringValues);
var inst = new SwitchInstruction(stringToInt); var inst = new SwitchInstruction(stringToInt);
inst.Sections.AddRange(sections); inst.Sections.AddRange(sections);
instructions[i + 1].ReplaceWith(inst);
instructions.RemoveAt(i);
block.Instructions[i].ReplaceWith(inst);
block.Instructions.RemoveRange(i + 1, 3);
info.Transformed = true;
hashtableInitializers[dictField] = info;
return true;
}
bool FindHashtableInitBlock(Block entryPoint, out List<(string, int)> stringValues, out IField dictField, out Block blockAfterThisInitBlock, out ILInstruction thisSwitchInitJumpInst, out ILInstruction nextSwitchInitJumpInst)
{
stringValues = null;
dictField = null;
blockAfterThisInitBlock = null;
nextSwitchInitJumpInst = null;
thisSwitchInitJumpInst = null;
if (entryPoint.Instructions.Count != 2)
return false;
// match first block: checking compiler-generated Hashtable for null
// if (comp(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f-1) != ldnull)) br switchHeadBlock
// br tableInitBlock
if (!(entryPoint.Instructions[0].MatchIfInstruction(out var condition, out var branchToSwitchHead)))
return false;
if (!entryPoint.Instructions[1].MatchBranch(out var tableInitBlock))
return false;
if (!(condition.MatchCompNotEquals(out var left, out var right) && right.MatchLdNull() &&
MatchDictionaryFieldLoad(left, IsNonGenericHashtable, out dictField, out var dictionaryType)))
return false;
if (!branchToSwitchHead.MatchBranch(out var switchHead))
return false;
thisSwitchInitJumpInst = entryPoint.Instructions[0];
// match second block: initialization of compiler-generated Hashtable
// stloc table(newobj Hashtable..ctor(ldc.i4 capacity, ldc.f loadFactor))
// call Add(ldloc table, ldstr value, box System.Int32(ldc.i4 index))
// ... more calls to Add ...
// volatile.stobj System.Collections.Hashtable(ldsflda $$method0x600003f - 1, ldloc table)
// br switchHeadBlock
if (tableInitBlock.IncomingEdgeCount != 1 || tableInitBlock.Instructions.Count < 3)
return false;
if (!ExtractStringValuesFromInitBlock(tableInitBlock, out stringValues, out blockAfterThisInitBlock, dictionaryType, dictField, true))
return false;
// if there is another IfInstruction before the end of the block, it might be a jump to the next hashtable init block.
// if (comp(volatile.ldobj System.Collections.Hashtable(ldsflda $$method0x600003f-2) != ldnull)) br switchHeadBlock
if (tableInitBlock.Instructions.SecondToLastOrDefault() is IfInstruction nextHashtableInitHead) {
if (!(nextHashtableInitHead.Condition.MatchCompNotEquals(out left, out right) && right.MatchLdNull() &&
MatchDictionaryFieldLoad(left, IsNonGenericHashtable, out var nextSwitchInitField, out _)))
return false;
if (!nextHashtableInitHead.TrueInst.MatchBranch(switchHead))
return false;
nextSwitchInitJumpInst = nextHashtableInitHead;
}
return true; return true;
} }

Write Preview
Loading…
Cancel
Save