diff options
| author | Luqun Lou <luqunl@microsoft.com> | 2017-09-21 02:50:21 +0300 |
|---|---|---|
| committer | Luqun Lou <luqunl@microsoft.com> | 2017-09-21 02:50:21 +0300 |
| commit | eaa0916ceb3fe84f74ef2e05d2320c160e33cd2c (patch) | |
| tree | d500db456a85b4cd55e6a7b39cee5255c07ebda9 /src/System.Private.Interop | |
| parent | bd8c3b149f19d8c66fd2e616f232728b915b1644 (diff) | |
Trivial update for dynamic interop
__ComObject.cs: during dynamic interop, We can generate dynamic adapter on fly for generic type
InteropCallInterceptors.cs: align with Mcg generated source code, always call McgMarshal.GetExceptionForHR instead
[tfs-changeset: 1674995]
Diffstat (limited to 'src/System.Private.Interop')
| -rw-r--r-- | src/System.Private.Interop/src/Shared/__ComObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/System.Private.Interop/src/Shared/__ComObject.cs b/src/System.Private.Interop/src/Shared/__ComObject.cs index 3a3cb1aab..11277cf61 100644 --- a/src/System.Private.Interop/src/Shared/__ComObject.cs +++ b/src/System.Private.Interop/src/Shared/__ComObject.cs @@ -2234,7 +2234,7 @@ namespace System /// </summary> private unsafe object GetDynamicAdapterInternal(RuntimeTypeHandle requestedType, RuntimeTypeHandle targetType) { - Debug.Assert(requestedType.HasDynamicAdapterClass()); + Debug.Assert(requestedType.HasDynamicAdapterClass() || requestedType.IsGenericType()); Debug.Assert(targetType.IsNull() || targetType.HasDynamicAdapterClass()); |