Use pattern matching

ds5678 · ds5678 · commit b2ca674b84b4 · 2025-09-08T13:56:33.000-07:00
diff --git a/ICSharpCode.Decompiler/IL/Transforms/TransformCollectionAndObjectInitializers.cs b/ICSharpCode.Decompiler/IL/Transforms/TransformCollectionAndObjectInitializers.cs
@@ -98,9 +98,9 @@ void IStatementTransform.Run(Block block, int pos, StatementTransformContext con
 					return;
 			}
 			// Copy-propagate stack slot holding an 'ldloca' of the variable
-			if (pos < block.Instructions.Count && block.Instructions[pos + 1] is StLoc { Variable: { Kind: VariableKind.StackSlot, IsSingleDefinition: true }, Value: LdLoca ldLoca } && ldLoca.Variable == v)
+			if (pos < block.Instructions.Count && block.Instructions[pos + 1] is StLoc { Variable: { Kind: VariableKind.StackSlot, IsSingleDefinition: true }, Value: LdLoca ldLoca } stLocStack && ldLoca.Variable == v)
 			{
-				CopyPropagation.Propagate((StLoc)block.Instructions[pos + 1], context);
+				CopyPropagation.Propagate(stLocStack, context);
 			}
 			int initializerItemsCount = 0;
 			bool initializerContainsInitOnlyItems = false;

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,9 @@ void IStatementTransform.Run(Block block, int pos, StatementTransformContext con`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`	`// Copy-propagate stack slot holding an 'ldloca' of the variable`
`101`		`- if (pos < block.Instructions.Count && block.Instructions[pos + 1] is StLoc { Variable: { Kind: VariableKind.StackSlot, IsSingleDefinition: true }, Value: LdLoca ldLoca } && ldLoca.Variable == v)`
	`101`	`+ if (pos < block.Instructions.Count && block.Instructions[pos + 1] is StLoc { Variable: { Kind: VariableKind.StackSlot, IsSingleDefinition: true }, Value: LdLoca ldLoca } stLocStack && ldLoca.Variable == v)`
`102`	`102`	`{`
`103`		`- CopyPropagation.Propagate((StLoc)block.Instructions[pos + 1], context);`
	`103`	`+ CopyPropagation.Propagate(stLocStack, context);`
`104`	`104`	`}`
`105`	`105`	`int initializerItemsCount = 0;`
`106`	`106`	`bool initializerContainsInitOnlyItems = false;`