Move copy propagation after expression and statement transforms.

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -131,7 +131,6 @@ namespace ICSharpCode.Decompiler.CSharp
 						// copy-propated (turned into two separate assignments of the constant).
 						// After is necessary because the assigned value might involve null coalescing/etc.
 						new StatementTransform(new ILInlining(), new TransformAssignment()),
-						new CopyPropagation(),
 						new StatementTransform(
 							// per-block transforms that depend on each other, and thus need to
 							// run interleaved (statement by statement).
@@ -156,6 +155,7 @@ namespace ICSharpCode.Decompiler.CSharp
 				},
 				new ProxyCallReplacer(),
 				new FixRemainingIncrements(),
+				new CopyPropagation(),
 				new DelegateConstruction(),
 				new LocalFunctionDecompiler(),
 				new TransformDisplayClassUsage(),

ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs

@@ -31,7 +31,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 	///    then we can replace the variable with the argument.
 	/// 2) assignments of address-loading instructions to local variables
 	/// </summary>
-	public class CopyPropagation : IBlockTransform
+	public class CopyPropagation : IBlockTransform, IILTransform
 	{
 		public static void Propagate(StLoc store, ILTransformContext context)
 		{
@@ -42,6 +42,20 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 		}
 
 		public void Run(Block block, BlockTransformContext context)
+		{
+			RunOnBlock(block, context);
+		}
+
+		public void Run(ILFunction function, ILTransformContext context)
+		{
+			foreach (var block in function.Descendants.OfType<Block>()) {
+				if (block.Kind != BlockKind.ControlFlow)
+					continue;
+				RunOnBlock(block, context);
+			}
+		}
+
+		static void RunOnBlock(Block block, ILTransformContext context)
 		{
 			for (int i = 0; i < block.Instructions.Count; i++) {
 				ILVariable v;