Fix for 462734

DelegateMethodInfoRetriever.GetDelegateMethodInfo was recently changed to throw MissingRuntimeArtifactException instead of returning null.

This caused one of the DG test to fail, and uncovered an actual real bug. The test was performing delegate.GetMethodInfo() calls, and asserting that 2 delegates constructed in different ways were returning the same MethodInfo. The test was passing for the wrong reason: because null == null is true :). The test needed some rd.xml entries to make the delegate's target method reflectable in order to get a valid MethodInfo.

In the USG case, delegate targets could be wrapped inside call converter thunks, which wasn't detected/handled correctly by the logic in TryGetMethodForOriginalLdFtnResult.

[tfs-changeset: 1665453]

1 files changed, 6 insertions, 2 deletions

diff --git a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.MappingTables.cs b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.MappingTables.cs
index 15db12b2c..2ebe05212 100644
--- a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.MappingTables.cs
+++ b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ExecutionEnvironmentImplementation.MappingTables.cs
@@ -935,8 +935,12 @@ namespace Internal.Reflection.Execution
                 }
                 else
                 {
-                    canonOriginalLdFtnResult = RuntimeAugments.GetCodeTarget(originalLdFtnResult);
-                    instantiationArgument = IntPtr.Zero;
+                    // The thunk could have been created by the TypeLoader as a dictionary slot for USG code
+                    if (!CallConverterThunk.TryGetCallConversionTargetPointerAndInstantiatingArg(originalLdFtnResult, out canonOriginalLdFtnResult, out instantiationArgument))
+                    {
+                        canonOriginalLdFtnResult = RuntimeAugments.GetCodeTarget(originalLdFtnResult);
+                        instantiationArgument = IntPtr.Zero;
+                    }
                 }
             }