diff options
| author | Michal Strehovský <MichalStrehovsky@users.noreply.github.com> | 2018-11-15 14:08:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 14:08:27 +0100 |
| commit | 4b01ac0d72d2b271a3f664d1fe3761287f5efc6a (patch) | |
| tree | ce702363d5b1a61f3783f8fc1e27dc182f71f8d6 /src/vm/custommarshalerinfo.cpp | |
| parent | bf1a55fab3f07771632a76d52c6d9287a339bb79 (diff) | |
| download | coreclr-4b01ac0d72d2b271a3f664d1fe3761287f5efc6a.tar.gz coreclr-4b01ac0d72d2b271a3f664d1fe3761287f5efc6a.tar.bz2 coreclr-4b01ac0d72d2b271a3f664d1fe3761287f5efc6a.zip | |
Allow supressing exceptions in diamond inheritance cases (#20458)
Diffstat (limited to 'src/vm/custommarshalerinfo.cpp')
| -rw-r--r-- | src/vm/custommarshalerinfo.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/vm/custommarshalerinfo.cpp b/src/vm/custommarshalerinfo.cpp index f9cb61296d..7201e106b8 100644 --- a/src/vm/custommarshalerinfo.cpp +++ b/src/vm/custommarshalerinfo.cpp @@ -294,24 +294,29 @@ MethodDesc *CustomMarshalerInfo::GetCustomMarshalerMD(EnumCustomMarshalerMethods { case CustomMarshalerMethods_MarshalNativeToManaged: pMD = pMT->GetMethodDescForInterfaceMethod( - MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__MARSHAL_NATIVE_TO_MANAGED)); + MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__MARSHAL_NATIVE_TO_MANAGED), + TRUE /* throwOnConflict */); break; case CustomMarshalerMethods_MarshalManagedToNative: pMD = pMT->GetMethodDescForInterfaceMethod( - MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__MARSHAL_MANAGED_TO_NATIVE)); + MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__MARSHAL_MANAGED_TO_NATIVE), + TRUE /* throwOnConflict */); break; case CustomMarshalerMethods_CleanUpNativeData: pMD = pMT->GetMethodDescForInterfaceMethod( - MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__CLEANUP_NATIVE_DATA)); + MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__CLEANUP_NATIVE_DATA), + TRUE /* throwOnConflict */); break; case CustomMarshalerMethods_CleanUpManagedData: pMD = pMT->GetMethodDescForInterfaceMethod( - MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__CLEANUP_MANAGED_DATA)); + MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__CLEANUP_MANAGED_DATA), + TRUE /* throwOnConflict */); break; case CustomMarshalerMethods_GetNativeDataSize: pMD = pMT->GetMethodDescForInterfaceMethod( - MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__GET_NATIVE_DATA_SIZE)); + MscorlibBinder::GetMethod(METHOD__ICUSTOM_MARSHALER__GET_NATIVE_DATA_SIZE), + TRUE /* throwOnConflict */); break; case CustomMarshalerMethods_GetInstance: // Must look this up by name since it's static |