Fix DispatchProxy not working with in parameters (#49214)

* Fix DispatchProxy not working with in parameters * Correct typo Co-authored-by: Christopher Watford <[email protected]> * Fixed Calling Convention Removed unneeded mods Co-authored-by: Christopher Watford <[email protected]>
dotnet · Apr 12, 2021 · 486757d · 486757d
1 parent d2cf673
commit 486757d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/...libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs b/...libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs
@@ -394,9 +394,19 @@ internal void AddInterfaceImpl([DynamicallyAccessedMembers(DynamicallyAccessedMe
             private MethodBuilder AddMethodImpl(MethodInfo mi, int methodInfoIndex)
             {
                 ParameterInfo[] parameters = mi.GetParameters();
-                Type[] paramTypes = ParamTypes(parameters, false);
+                Type[] paramTypes = new Type[parameters.Length];
+                Type[][] paramReqMods = new Type[paramTypes.Length][];
+
+                for (int i = 0; i < parameters.Length; i++)
+                {
+                    paramTypes[i] = parameters[i].ParameterType;
+                    paramReqMods[i] = parameters[i].GetRequiredCustomModifiers();
+                }
+
+                MethodBuilder mdb = _tb.DefineMethod(mi.Name, MethodAttributes.Public | MethodAttributes.Virtual, CallingConventions.Standard,
+                    mi.ReturnType, null, null,
+                    paramTypes, paramReqMods, null);
 
-                MethodBuilder mdb = _tb.DefineMethod(mi.Name, MethodAttributes.Public | MethodAttributes.Virtual, mi.ReturnType, paramTypes);
                 if (mi.ContainsGenericParameters)
                 {
                     Type[] ts = mi.GetGenericArguments();

diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/DispatchProxyTests.cs b/src/libraries/System.Reflection.DispatchProxy/tests/DispatchProxyTests.cs
@@ -603,6 +603,7 @@ public static void Invoke_Ref_Out_In_Method()
             testRefOutInInvocation(p => p.Out(out _), null);
             testRefOutInInvocation(p => p.OutAttribute(value), "Hello");
             testRefOutInInvocation(p => p.Ref(ref value), "Hello");
+            testRefOutInInvocation(p => p.In(in value), "Hello");
         }
 
         private static void testRefOutInInvocation(Action<TestType_IOut_Ref> invocation, string expected)

diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/TestTypes.cs b/src/libraries/System.Reflection.DispatchProxy/tests/TestTypes.cs
@@ -19,6 +19,7 @@ public interface TestType_IHelloService
 
 public interface TestType_IOut_Ref
 {
+    void In(in string message);
     void Out(out string message);
     void Ref(ref string message);
     void InAttribute([In] string message);