Use IsCopyConstructed modreq consistently in test (dotnet#40168)

davidwrighton · web-flow · commit 96d2bf042d65 · 2020-07-30T21:03:39.000-07:00
- X86 calling convention for copy constructed arguments is special, therefore the delegate must have the IsCopyConstructed modreq as well as the callsite
diff --git a/src/tests/Interop/PInvoke/Miscellaneous/CopyCtor/CopyCtorTest.cs b/src/tests/Interop/PInvoke/Miscellaneous/CopyCtor/CopyCtorTest.cs
@@ -26,12 +26,9 @@ public static unsafe int StructWithCtorTest(StructWithCtor* ptrStruct, ref Struc
         return 100;
     }
 
-    [UnmanagedFunctionPointerAttribute(CallingConvention.StdCall)]
-    public delegate int TestDelegate(StructWithCtor* ptrStruct, ref StructWithCtor refStruct);
-
     public static unsafe int Main()
     {
-        TestDelegate del = (TestDelegate)StructWithCtorTest;
+        TestDelegate del = (TestDelegate)Delegate.CreateDelegate(typeof(TestDelegate), typeof(CopyCtor).GetMethod("StructWithCtorTest"));
         StructWithCtor s1 = new StructWithCtor();
         StructWithCtor s2 = new StructWithCtor();
         s1._instanceField = 1;
diff --git a/src/tests/Interop/PInvoke/Miscellaneous/CopyCtor/CopyCtorUtil.il b/src/tests/Interop/PInvoke/Miscellaneous/CopyCtor/CopyCtorUtil.il
@@ -5,6 +5,39 @@
 .assembly extern System.Runtime.CompilerServices.VisualC { }
 .assembly CopyCtorUtil { }
 
+.class auto ansi sealed public TestDelegate
+       extends [mscorlib]System.MulticastDelegate
+{
+  .custom instance void [mscorlib]System.Runtime.InteropServices.UnmanagedFunctionPointerAttribute::.ctor(valuetype [mscorlib]System.Runtime.InteropServices.CallingConvention) = ( 01 00 03 00 00 00 00 00 ) 
+  .method public hidebysig specialname rtspecialname 
+          instance void  .ctor(object 'object',
+                               native int 'method') runtime managed
+  {
+  } // end of method TestDelegate::.ctor
+
+  .method public hidebysig newslot virtual 
+          instance int32  Invoke(valuetype [CopyCtorUtil]StructWithCtor modreq([mscorlib]System.Runtime.CompilerServices.IsCopyConstructed)* ptrStruct,
+                                 valuetype [CopyCtorUtil]StructWithCtor modreq([mscorlib]System.Runtime.CompilerServices.IsCopyConstructed)& refStruct) runtime managed
+  {
+  } // end of method TestDelegate::Invoke
+
+  .method public hidebysig newslot virtual 
+          instance class [mscorlib]System.IAsyncResult 
+          BeginInvoke(valuetype [CopyCtorUtil]StructWithCtor modreq([mscorlib]System.Runtime.CompilerServices.IsCopyConstructed)* ptrStruct,
+                      valuetype [CopyCtorUtil]StructWithCtor modreq([mscorlib]System.Runtime.CompilerServices.IsCopyConstructed)& refStruct,
+                      class [mscorlib]System.AsyncCallback callback,
+                      object 'object') runtime managed
+  {
+  } // end of method TestDelegate::BeginInvoke
+
+  .method public hidebysig newslot virtual 
+          instance int32  EndInvoke(valuetype [CopyCtorUtil]StructWithCtor modreq([mscorlib]System.Runtime.CompilerServices.IsCopyConstructed)& refStruct,
+                                    class [mscorlib]System.IAsyncResult result) runtime managed
+  {
+  } // end of method TestDelegate::EndInvoke
+
+} // end of class TestDelegate
+
 .class public sealed sequential ansi beforefieldinit StructWithCtor
        extends [mscorlib]System.ValueType
 {

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,9 @@ public static unsafe int StructWithCtorTest(StructWithCtor* ptrStruct, ref Struc`
`26`	`26`	`return 100;`
`27`	`27`	`}`
`28`	`28`
`29`		`- [UnmanagedFunctionPointerAttribute(CallingConvention.StdCall)]`
`30`		`- public delegate int TestDelegate(StructWithCtor* ptrStruct, ref StructWithCtor refStruct);`
`31`		`-`
`32`	`29`	`public static unsafe int Main()`
`33`	`30`	`{`
`34`		`- TestDelegate del = (TestDelegate)StructWithCtorTest;`
	`31`	`+ TestDelegate del = (TestDelegate)Delegate.CreateDelegate(typeof(TestDelegate), typeof(CopyCtor).GetMethod("StructWithCtorTest"));`
`35`	`32`	`StructWithCtor s1 = new StructWithCtor();`
`36`	`33`	`StructWithCtor s2 = new StructWithCtor();`
`37`	`34`	`s1._instanceField = 1;`