move TransformValueTypeInitializers to ExpressionTransforms

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -47,7 +47,6 @@ namespace ICSharpCode.Decompiler.CSharp
 			new ILInlining(),
 			new TransformingVisitor(),
 			new ExpressionTransforms(),
-			new TransformValueTypeInitializers(),
 			new TransformArrayInitializers()
 		};
 

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -133,7 +133,6 @@
     <Compile Include="IL\InstructionOutputExtensions.cs" />
     <Compile Include="IL\PrimitiveType.cs" />
     <Compile Include="IL\StackType.cs" />
-    <Compile Include="IL\Transforms\TransformValueTypeInitializers.cs" />
     <Compile Include="Output\ITextOutput.cs" />
     <Compile Include="Output\PlainTextOutput.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

ICSharpCode.Decompiler/IL/ILReader.cs

@@ -800,14 +800,14 @@ namespace ICSharpCode.Decompiler.IL
 		
 		LdLoc Peek()
 		{
+			Debug.Assert(!currentStack.IsEmpty);
 			// TODO: handle stack underflow?
 			return new LdLoc(currentStack.Peek());
 		}
 		
 		LdLoc Pop()
 		{
-			if (currentStack.IsEmpty)
+			Debug.Assert(!currentStack.IsEmpty);
-				Debugger.Break();
 			// TODO: handle stack underflow?
 			ILVariable v;
 			currentStack = currentStack.Pop(out v);

ICSharpCode.Decompiler/IL/Transforms/ExpressionTransforms.cs

@@ -16,6 +16,8 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 using System;
+using System.Linq;
+using ICSharpCode.NRefactory.TypeSystem;
 
 namespace ICSharpCode.Decompiler.IL.Transforms
 {
@@ -61,5 +63,18 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 				inst.ReplaceWith(new LogicNot(new Ceq(inst.Left, inst.Right) { ILRange = inst.ILRange }));
 			}
 		}
+		
+		protected internal override void VisitCall(Call inst)
+		{
+			base.VisitCall(inst);
+			if (!inst.Method.IsConstructor || inst.Method.DeclaringType.Kind != TypeKind.Struct)
+				return;
+			if (inst.Arguments.Count != inst.Method.Parameters.Count + 1)
+				return;
+			var newObj = new NewObj(inst.Method);
+			newObj.Arguments.AddRange(inst.Arguments.Skip(1));
+			var expr = new StObj(inst.Arguments[0], newObj, inst.Method.DeclaringType);
+			inst.ReplaceWith(expr);
+		}
 	}
 }

ICSharpCode.Decompiler/IL/Transforms/TransformValueTypeInitializers.cs

@@ -1,55 +0,0 @@
-// Copyright (c) 2015 Siegfried Pammer
-// 
-// 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.Linq;
-using ICSharpCode.NRefactory.TypeSystem;
-
-namespace ICSharpCode.Decompiler.IL
-{
-	public class TransformValueTypeInitializers : IILTransform
-	{
-		ILTransformContext context;
-
-		void IILTransform.Run(ILFunction function, ILTransformContext context)
-		{
-			this.context = context;
-			foreach (var block in function.Descendants.OfType<Block>()) {
-				for (int i = block.Instructions.Count - 1; i >= 0; i--) {
-					DoTransform(block, i);
-				}
-			}
-		}
-
-		bool DoTransform(Block block, int pos)
-		{
-			Call call = block.Instructions[pos] as Call;
-			if (call == null || !call.Method.IsConstructor || call.Method.DeclaringType.Kind != TypeKind.Struct)
-				return false;
-			if (call.Arguments.Count != call.Method.Parameters.Count + 1)
-				return false;
-			var newObj = new NewObj(call.Method);
-			newObj.Arguments.AddRange(call.Arguments.Skip(1));
-			var expr = new StObj(call.Arguments[0], newObj, call.Method.DeclaringType);
-			block.Instructions[pos].ReplaceWith(expr);
-			return true;
-		}
-	}
-}
-
-