Don't eliminate delegate caching when lambda decompilation is disabled.

Closes icsharpcode#388
ivanjh · May 10, 2013 · d2c24a3 · d2c24a3
1 parent a90cf65
commit d2c24a3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs b/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs
@@ -225,11 +225,13 @@ public void Optimize(DecompilerContext context, ILBlock method, ILAstOptimizatio
 			new ILInlining(method).InlineAllVariables();
 
 			if (abortBeforeStep == ILAstOptimizationStep.CachedDelegateInitialization) return;
-			foreach(ILBlock block in method.GetSelfAndChildrenRecursive<ILBlock>()) {
-				for (int i = 0; i < block.Body.Count; i++) {
-					// TODO: Move before loops
-					CachedDelegateInitializationWithField(block, ref i);
-					CachedDelegateInitializationWithLocal(block, ref i);
+			if (context.Settings.AnonymousMethods) {
+				foreach(ILBlock block in method.GetSelfAndChildrenRecursive<ILBlock>()) {
+					for (int i = 0; i < block.Body.Count; i++) {
+						// TODO: Move before loops
+						CachedDelegateInitializationWithField(block, ref i);
+						CachedDelegateInitializationWithLocal(block, ref i);
+					}
 				}
 			}
 

diff --git a/ICSharpCode.Decompiler/Tests/DelegateConstruction.cs b/ICSharpCode.Decompiler/Tests/DelegateConstruction.cs
@@ -62,6 +62,22 @@ public Action CaptureOfThisAndParameterInForEachWithItemCopy(int a)
 			}
 			return null;
 		}
+
+		public void LambdaInForLoop()
+		{
+			for (int i = 0; i < 100000; i++) {
+			    Bar(() => Foo());
+			}
+		}
+
+		public int Foo()
+		{
+			return 0;
+		}
+
+		public void Bar(Func<int> f)
+		{
+		}
 	}
 
 	public static void Test(this string a)