Fix #3432: Do not include delegate construction use-sites in DetermineCaptureAndDeclarationScopes.

siegfriedpammer · siegfriedpammer · commit 49942382d17f · 2025-03-19T22:52:27.000+01:00
diff --git a/ICSharpCode.Decompiler/IL/Transforms/LocalFunctionDecompiler.cs b/ICSharpCode.Decompiler/IL/Transforms/LocalFunctionDecompiler.cs
@@ -658,6 +658,12 @@ void DetermineCaptureAndDeclarationScope(LocalFunctionInfo info, ILInstruction u
 			switch (useSite)
 			{
 				case CallInstruction call:
+					if (DelegateConstruction.MatchDelegateConstruction(useSite, out _, out _, out _))
+					{
+						// if this is a delegate construction, skip the use-site, because the capture scope
+						// was already determined when analyzing "this".
+						break;
+					}
 					int firstArgumentIndex = info.Definition.Method.IsStatic ? 0 : 1;
 					for (int i = call.Arguments.Count - 1; i >= firstArgumentIndex; i--)
 					{

Original file line number	Diff line number	Diff line change
`@@ -658,6 +658,12 @@ void DetermineCaptureAndDeclarationScope(LocalFunctionInfo info, ILInstruction u`
`658`	`658`	`switch (useSite)`
`659`	`659`	`{`
`660`	`660`	`case CallInstruction call:`
	`661`	`+ if (DelegateConstruction.MatchDelegateConstruction(useSite, out _, out _, out _))`
	`662`	`+ {`
	`663`	`+ // if this is a delegate construction, skip the use-site, because the capture scope`
	`664`	`+ // was already determined when analyzing "this".`
	`665`	`+ break;`
	`666`	`+ }`
`661`	`667`	`int firstArgumentIndex = info.Definition.Method.IsStatic ? 0 : 1;`
`662`	`668`	`for (int i = call.Arguments.Count - 1; i >= firstArgumentIndex; i--)`
`663`	`669`	`{`