Add more asserts and ToStrings around the FakeProperty.Setter problem

icsharpcode · Oct 5, 2022 · 44a6aa7 · 44a6aa7
1 parent 18481ef
commit 44a6aa7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/ICSharpCode.Decompiler/CSharp/CallBuilder.cs b/ICSharpCode.Decompiler/CSharp/CallBuilder.cs
@@ -539,6 +539,8 @@ public ExpressionWithResolveResult BuildCollectionInitializerExpression(OpCode c
 		public ExpressionWithResolveResult BuildDictionaryInitializerExpression(OpCode callOpCode, IMethod method,
 			InitializedObjectResolveResult target, IReadOnlyList<ILInstruction> indices, ILInstruction value = null)
 		{
+			if (method is null) throw new ArgumentNullException(nameof(method));
+
 			ExpectedTargetDetails expectedTargetDetails = new ExpectedTargetDetails { CallOpCode = callOpCode };
 
 			var callArguments = new List<ILInstruction>();

diff --git a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
@@ -3340,6 +3340,7 @@ private ArrayInitializerExpression BuildArrayInitializerExpression(Block block,
 						{
 							var property = (IProperty)lastElement.Member;
 							Debug.Assert(property.IsIndexer);
+							Debug.Assert(property.Setter != null, $"Indexer property {property} has no setter");
 							elementsStack.Peek().Add(
 								new CallBuilder(this, typeSystem, settings)
 									.BuildDictionaryInitializerExpression(lastElement.OpCode, property.Setter, initObjRR, GetIndices(lastElement.Indices, indexVariables).ToList(), info.Values.Single())

diff --git a/ICSharpCode.Decompiler/TypeSystem/Implementation/FakeMember.cs b/ICSharpCode.Decompiler/TypeSystem/Implementation/FakeMember.cs
@@ -199,6 +199,16 @@ public override IMember Specialize(TypeParameterSubstitution substitution)
 		public bool IsIndexer { get; set; }
 		public bool ReturnTypeIsRefReadOnly => false;
 		public IReadOnlyList<IParameter> Parameters { get; set; }
+
+		public override string ToString() =>
+			"FakeProperty " + ReturnType + " " + DeclaringType.Name + "." + Name +
+				(Parameters.Count == 0
+					? ""
+					: "[" + string.Join(", ", Parameters) + "]") +
+				" { " +
+					(CanGet ? "get; " : "") +
+					(CanSet ? "set; " : "") +
+				"}";
 	}
 
 	sealed class FakeEvent : FakeMember, IEvent