Add ILAst folding and remove unused RemoveDeadVariableInit transform.

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -47,7 +47,6 @@ namespace ICSharpCode.Decompiler.CSharp
 		readonly DecompilerSettings settings;
 
 		List<IILTransform> ilTransforms = new List<IILTransform> {
-			//new RemoveDeadVariableInit(),
 			new SplitVariables(),
 			new ControlFlowSimplification(),
 			//new ILInlining(), // temporary pass, just to make the ILAst easier to read while debugging loop detection

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -127,7 +127,6 @@
     <Compile Include="IL\Transforms\ExpressionTransforms.cs" />
     <Compile Include="IL\Transforms\InlineCompilerGeneratedVariables.cs" />
     <Compile Include="IL\Transforms\LoopingTransform.cs" />
-    <Compile Include="IL\Transforms\RemoveDeadVariableInit.cs" />
     <Compile Include="IL\Transforms\SplitVariables.cs" />
     <Compile Include="IL\Transforms\TransformArrayInitializers.cs" />
     <Compile Include="CecilExtensions.cs" />

ICSharpCode.Decompiler/IL/Instructions/Block.cs

@@ -120,6 +120,8 @@ namespace ICSharpCode.Decompiler.IL
 			output.WriteDefinition(Label, this);
 			if (Parent is BlockContainer)
 				output.Write(" (incoming: {0})", IncomingEdgeCount);
+			output.Write(' ');
+			output.MarkFoldStart("{...}");
 			output.WriteLine(" {");
 			output.Indent();
 			foreach (var inst in Instructions) {
@@ -133,6 +135,7 @@ namespace ICSharpCode.Decompiler.IL
 			}
 			output.Unindent();
 			output.Write("}");
+			output.MarkFoldEnd();
 		}
 		
 		protected override int GetChildCount()

ICSharpCode.Decompiler/IL/Instructions/BlockContainer.cs

@@ -107,7 +107,9 @@ namespace ICSharpCode.Decompiler.IL
 		public override void WriteTo(ITextOutput output)
 		{
 			output.WriteDefinition("BlockContainer", this);
-			output.WriteLine(" {");
+			output.Write(' ');
+			output.MarkFoldStart("{...}");
+			output.WriteLine("{");
 			output.Indent();
 			foreach (var inst in Blocks) {
 				inst.WriteTo(output);
@@ -116,6 +118,7 @@ namespace ICSharpCode.Decompiler.IL
 			}
 			output.Unindent();
 			output.Write("}");
+			output.MarkFoldEnd();
 		}
 		
 		protected override int GetChildCount()

ICSharpCode.Decompiler/IL/Instructions/ILFunction.cs

@@ -43,10 +43,12 @@ namespace ICSharpCode.Decompiler.IL
 			output.WriteLine(" {");
 			output.Indent();
 			
+			output.MarkFoldStart(Variables.Count + " variable(s)", true);
 			foreach (var variable in Variables) {
 				variable.WriteDefinitionTo(output);
 				output.WriteLine();
 			}
+			output.MarkFoldEnd();
 			output.WriteLine();
 			body.WriteTo(output);
 			

ICSharpCode.Decompiler/IL/Instructions/SwitchInstruction.cs

@@ -68,7 +68,9 @@ namespace ICSharpCode.Decompiler.IL
 		{
 			output.Write("switch (");
 			value.WriteTo(output);
-			output.WriteLine(") {");
+			output.Write(") ");
+			output.MarkFoldStart("{...}");
+			output.WriteLine("{");
 			output.Indent();
 			foreach (var section in this.Sections) {
 				section.WriteTo(output);
@@ -76,6 +78,7 @@ namespace ICSharpCode.Decompiler.IL
 			}
 			output.Unindent();
 			output.Write('}');
+			output.MarkFoldEnd();
 		}
 		
 		protected override int GetChildCount()

ICSharpCode.Decompiler/IL/Transforms/RemoveDeadVariableInit.cs

@@ -1,43 +0,0 @@
-// Copyright (c) 2016 Daniel Grunwald
-// 
-// 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.Diagnostics;
-using System.Linq;
-using ICSharpCode.Decompiler.FlowAnalysis;
-
-namespace ICSharpCode.Decompiler.IL.Transforms
-{
-	/// <summary>
-	/// Remove <c>HasInitialValue</c> from locals that are definitely assigned before every use
-	/// (=the initial value is a dead store).
-	/// </summary>
-	public class RemoveDeadVariableInit : IILTransform
-	{
-		public void Run(ILFunction function, ILTransformContext context)
-		{
-			var visitor = new DefiniteAssignmentVisitor(function);
-			function.Body.AcceptVisitor(visitor);
-			foreach (var v in function.Variables) {
-				if (v.Kind != VariableKind.Parameter && !visitor.IsPotentiallyUsedUninitialized(v)) {
-					v.HasInitialValue = false;
-				}
-			}
-		}
-	}
-}