Fix #3310: Filter out copy-constructor only if it's an actual record …

…type.
icsharpcode · Oct 24, 2024 · e96605c · e96605c
1 parent c3261a3
commit e96605c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Pretty/ConstructorInitializers.cs b/ICSharpCode.Decompiler.Tests/TestCases/Pretty/ConstructorInitializers.cs
@@ -137,5 +137,15 @@ public void Print()
 			}
 		}
 #endif
+
+		public class NoRecordButCopyConstructorLike
+		{
+			private NoRecordButCopyConstructorLike parent;
+
+			public NoRecordButCopyConstructorLike(NoRecordButCopyConstructorLike parent)
+			{
+				this.parent = parent;
+			}
+		}
 	}
 }
diff --git a/ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs b/ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs
@@ -190,11 +190,11 @@ void HandleInstanceFieldInitializers(IEnumerable<AstNode> members)
 
 				bool ctorIsUnsafe = instanceCtorsNotChainingWithThis.All(c => c.HasModifier(Modifiers.Unsafe));
 
-				if (!context.DecompileRun.RecordDecompilers.TryGetValue(ctorMethodDef.DeclaringTypeDefinition, out var record))
+				if (!context.DecompileRun.RecordDecompilers.TryGetValue(declaringTypeDefinition, out var record))
 					record = null;
 
 				// Filter out copy constructor of records
-				if (record != null)
+				if (record != null && declaringTypeDefinition.IsRecord)
 					instanceCtorsNotChainingWithThis = instanceCtorsNotChainingWithThis.Where(ctor => !record.IsCopyConstructor(ctor.GetSymbol() as IMethod)).ToArray();
 
 				// Recognize field or property initializers: