Merge branch 'master' into use-type-hint-in-pointer-arithmetic

Author: ds5678

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -93,6 +93,7 @@
     <None Include="TestCases\ILPretty\GuessAccessors.cs" />
     <None Include="TestCases\ILPretty\GuessAccessors.il" />
     <None Include="TestCases\ILPretty\Issue2260SwitchString.il" />
+    <None Include="TestCases\ILPretty\Issue3442.il" />
     <None Include="TestCases\ILPretty\MonoFixed.il" />
     <None Include="TestCases\ILPretty\UnknownTypes.cs" />
     <None Include="TestCases\ILPretty\UnknownTypes.il" />
@@ -131,10 +132,13 @@
     <Compile Include="ProjectDecompiler\TargetFrameworkTests.cs" />
     <Compile Include="TestAssemblyResolver.cs" />
     <Compile Include="TestCases\ILPretty\Issue3421.cs" />
+    <Compile Include="TestCases\ILPretty\Issue3442.cs" />
     <Compile Include="TestCases\ILPretty\MonoFixed.cs" />
     <Compile Include="TestCases\Pretty\Comparisons.cs" />
     <Compile Include="TestCases\Pretty\PointerArithmetic.cs" />
+    <Compile Include="TestCases\Pretty\Issue3406.cs" />
     <Compile Include="TestCases\Pretty\Issue3439.cs" />
+    <Compile Include="TestCases\Pretty\Issue3442.cs" />
     <None Include="TestCases\VBPretty\VBAutomaticEvents.vb" />
     <Compile Include="TestCases\VBPretty\VBAutomaticEvents.cs" />
     <Compile Include="TestCases\VBPretty\VBNonGenericForEach.cs" />

ICSharpCode.Decompiler.Tests/ILPrettyTestRunner.cs

@@ -213,6 +213,12 @@ public async Task Issue3421()
 			await Run();
 		}
 
+		[Test]
+		public async Task Issue3442()
+		{
+			await Run();
+		}
+
 		[Test]
 		public async Task Issue2260SwitchString()
 		{

ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs

@@ -610,6 +610,18 @@ public async Task Issue3439([ValueSource(nameof(defaultOptions))] CompilerOption
 			await RunForLibrary(cscOptions: cscOptions);
 		}
 
+		[Test]
+		public async Task Issue3406([ValueSource(nameof(roslyn4OrNewerOptions))] CompilerOptions cscOptions)
+		{
+			await RunForLibrary(cscOptions: cscOptions);
+		}
+
+		[Test]
+		public async Task Issue3442([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions)
+		{
+			await RunForLibrary(cscOptions: cscOptions);
+		}
+
 		[Test]
 		public async Task AssemblyCustomAttributes([ValueSource(nameof(defaultOptions))] CompilerOptions cscOptions)
 		{

ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue3442.cs

@@ -0,0 +1,19 @@
+namespace ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442
+{
+	public class Class : Interface
+	{
+		private void M<T>() where T : Interface
+		{
+		}
+
+		void Interface.M<T>()
+		{
+			//ILSpy generated this explicit interface implementation from .override directive in M
+			this.M<T>();
+		}
+	}
+	public interface Interface
+	{
+		void M<T>() where T : Interface;
+	}
+}

ICSharpCode.Decompiler.Tests/TestCases/ILPretty/Issue3442.il

@@ -0,0 +1,78 @@
+.assembly extern System.Runtime
+{
+	.publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         // .z\V.4..
+	.ver 4:0:0:0
+}
+
+.assembly Issue3442
+{
+	.custom instance void [System.Runtime]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = (
+		01 00 08 00 00 00 00 00
+	)
+	.custom instance void [System.Runtime]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = (
+		01 00 01 00 54 02 16 57 72 61 70 4e 6f 6e 45 78
+		63 65 70 74 69 6f 6e 54 68 72 6f 77 73 01
+	)
+	.custom instance void [System.Runtime]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [System.Runtime]System.Diagnostics.DebuggableAttribute/DebuggingModes) = (
+		01 00 02 00 00 00 00 00
+	)
+	.permissionset reqmin = (
+		2e 01 80 8a 53 79 73 74 65 6d 2e 53 65 63 75 72
+		69 74 79 2e 50 65 72 6d 69 73 73 69 6f 6e 73 2e
+		53 65 63 75 72 69 74 79 50 65 72 6d 69 73 73 69
+		6f 6e 41 74 74 72 69 62 75 74 65 2c 20 53 79 73
+		74 65 6d 2e 52 75 6e 74 69 6d 65 2c 20 56 65 72
+		73 69 6f 6e 3d 39 2e 30 2e 30 2e 30 2c 20 43 75
+		6c 74 75 72 65 3d 6e 65 75 74 72 61 6c 2c 20 50
+		75 62 6c 69 63 4b 65 79 54 6f 6b 65 6e 3d 62 30
+		33 66 35 66 37 66 31 31 64 35 30 61 33 61 15 01
+		54 02 10 53 6b 69 70 56 65 72 69 66 69 63 61 74
+		69 6f 6e 01
+	)
+	.hash algorithm 0x00008004 // SHA1
+	.ver 0:0:0:0
+}
+
+.class private auto ansi '<Module>'
+{
+} // end of class <Module>
+
+.class interface public auto ansi abstract beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Interface
+{
+	// Methods
+	.method public hidebysig newslot abstract virtual 
+		instance void M<(ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Interface) T> () cil managed 
+	{
+	} // end of method Interface::M
+
+} // end of class ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Interface
+
+.class public auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Class
+	extends [System.Runtime]System.Object
+	implements ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Interface
+{
+	// Methods
+	.method private final hidebysig newslot virtual 
+		instance void M<(ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Interface) T> () cil managed 
+	{
+		.override method instance void ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Interface::M()
+		// Method begins at RVA 0x2050
+		// Code size 1 (0x1)
+		.maxstack 8
+
+		IL_0000: ret
+	} // end of method Class::M
+
+	.method public hidebysig specialname rtspecialname 
+		instance void .ctor () cil managed 
+	{
+		// Method begins at RVA 0x2052
+		// Code size 7 (0x7)
+		.maxstack 8
+
+		IL_0000: ldarg.0
+		IL_0001: call instance void [System.Runtime]System.Object::.ctor()
+		IL_0006: ret
+	} // end of method Class::.ctor
+
+} // end of class ICSharpCode.Decompiler.Tests.TestCases.ILPretty.Issue3442.Class

ICSharpCode.Decompiler.Tests/TestCases/Pretty/DelegateConstruction.cs

@@ -40,6 +40,7 @@ internal class Dummy
 		[CompilerGenerated]
 		internal class Helper
 		{
+			[CompilerGenerated]
 			internal bool HelpMe(Dummy dum)
 			{
 				return true;

ICSharpCode.Decompiler.Tests/TestCases/Pretty/Issue3406.cs

@@ -0,0 +1,35 @@
+internal class Issue3406
+{
+	private record struct S1(int Value);
+
+	private record struct S2
+	{
+		public int Value;
+
+		public S2(int value)
+		{
+			Value = value;
+		}
+
+		public S2(int a, int b)
+		{
+			Value = a + b;
+		}
+	}
+
+	private record struct S3
+	{
+		public int Value;
+
+		public S3(int value)
+		{
+			Value = value;
+		}
+	}
+
+	// This also generates a hidden backing field
+	private record struct S4(int value)
+	{
+		public int Value = value;
+	}
+}

ICSharpCode.Decompiler.Tests/TestCases/Pretty/Issue3442.cs

@@ -0,0 +1,13 @@
+namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty.Issue3442
+{
+	public class Class : Interface
+	{
+		void Interface.M<T>()
+		{
+		}
+	}
+	public interface Interface
+	{
+		void M<T>() where T : Interface;
+	}
+}

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -1167,8 +1167,7 @@ IEnumerable<EntityDeclaration> AddInterfaceImplHelpers(
 				methodDecl.TypeParameters.AddRange(memberDecl.GetChildrenByRole(Roles.TypeParameter)
 												   .Select(n => (TypeParameterDeclaration)n.Clone()));
 				methodDecl.Parameters.AddRange(memberDecl.GetChildrenByRole(Roles.Parameter).Select(n => n.Clone()));
-				methodDecl.Constraints.AddRange(memberDecl.GetChildrenByRole(Roles.Constraint)
-												.Select(n => (Constraint)n.Clone()));
+				// Constraints are not copied because explicit interface implementations cannot have constraints. CS0460
 
 				methodDecl.Body = new BlockStatement();
 				methodDecl.Body.AddChild(new Comment(

ICSharpCode.Decompiler/CSharp/RecordDecompiler.cs

@@ -222,10 +222,14 @@ bool IsPrimaryConstructor(IMethod method, IMethod unspecializedMethod)
 					{
 						backingMember = property;
 					}
-					else
+					else if (!recordTypeDef.IsRecord)
 					{
 						backingMember = field;
 					}
+					else
+					{
+						return false;
+					}
 
 					primaryCtorParameterToAutoPropertyOrBackingField.Add(unspecializedMethod.Parameters[i], backingMember);
 					autoPropertyOrBackingFieldToPrimaryCtorParameter.Add(backingMember, unspecializedMethod.Parameters[i]);