diff options
| author | Steve MacLean <stmaclea@microsoft.com> | 2019-05-08 16:08:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 16:08:29 -0400 |
| commit | 883a27180106affebd45814f5b6fc236c9d7eab2 (patch) | |
| tree | c06d84c9bea73effa8dc7a2c8748d42acbc7f577 /src/vm/interoputil.cpp | |
| parent | b7836c0b6e59f4e6bd6af984569f4ce8b3573f4e (diff) | |
| download | coreclr-883a27180106affebd45814f5b6fc236c9d7eab2.tar.gz coreclr-883a27180106affebd45814f5b6fc236c9d7eab2.tar.bz2 coreclr-883a27180106affebd45814f5b6fc236c9d7eab2.zip | |
Remove more MDA support code (#24457)
* Remove more MDA support code
* PR Feedback
Diffstat (limited to 'src/vm/interoputil.cpp')
| -rw-r--r-- | src/vm/interoputil.cpp | 58 |
1 files changed, 3 insertions, 55 deletions
diff --git a/src/vm/interoputil.cpp b/src/vm/interoputil.cpp index 11859f50cf..7b24f9c80c 100644 --- a/src/vm/interoputil.cpp +++ b/src/vm/interoputil.cpp @@ -20,7 +20,6 @@ #include "interopconverter.h" #include "wrappers.h" #include "invokeutil.h" -#include "mdaassistants.h" #include "comcallablewrapper.h" #include "../md/compiler/custattr.h" #include "siginfo.hpp" @@ -1408,11 +1407,7 @@ ErrExit: return hr; } -void SafeRelease_OnException(IUnknown* pUnk, RCW* pRCW -#ifdef MDA_SUPPORTED - , MdaReportAvOnComRelease* pProbe -#endif // MDA_SUPPORTED - ) +void SafeRelease_OnException(IUnknown* pUnk, RCW* pRCW) { CONTRACTL { @@ -1422,12 +1417,6 @@ void SafeRelease_OnException(IUnknown* pUnk, RCW* pRCW CONTRACTL_END; #ifndef CROSSGEN_COMPILE -#ifdef MDA_SUPPORTED - // Report the exception that was thrown. - if (pProbe) - pProbe->ReportHandledException(pRCW); -#endif // MDA_SUPPORTED - #ifdef FEATURE_COMINTEROP LogInterop(W("An exception occurred during release")); LogInteropLeak(pUnk); @@ -1457,15 +1446,6 @@ ULONG SafeReleasePreemp(IUnknown * pUnk, RCW * pRCW) // Message pump could happen, so arbitrary managed code could run. CONTRACT_VIOLATION(ThrowsViolation | FaultViolation); -#ifdef MDA_SUPPORTED - // Mode where we just let the fault occur. - MdaReportAvOnComRelease* pProbe = MDA_GET_ASSISTANT_EX(ReportAvOnComRelease); - if (pProbe && pProbe->AllowAV()) - { - return pUnk->Release(); - } -#endif // MDA_SUPPORTED - bool fException = false; SCAN_EHMARKER(); @@ -1500,11 +1480,7 @@ ULONG SafeReleasePreemp(IUnknown * pUnk, RCW * pRCW) if (fException) { - SafeRelease_OnException(pUnk, pRCW -#ifdef MDA_SUPPORTED - , pProbe -#endif // MDA_SUPPORTED - ); + SafeRelease_OnException(pUnk, pRCW); } return res; @@ -1531,15 +1507,6 @@ ULONG SafeRelease(IUnknown* pUnk, RCW* pRCW) // Message pump could happen, so arbitrary managed code could run. CONTRACT_VIOLATION(ThrowsViolation | FaultViolation); -#ifdef MDA_SUPPORTED - // Mode where we just let the fault occur. - MdaReportAvOnComRelease* pProbe = MDA_GET_ASSISTANT_EX(ReportAvOnComRelease); - if (pProbe && pProbe->AllowAV()) - { - return pUnk->Release(); - } -#endif // MDA_SUPPORTED - bool fException = false; SCAN_EHMARKER(); @@ -1574,11 +1541,7 @@ ULONG SafeRelease(IUnknown* pUnk, RCW* pRCW) if (fException) { - SafeRelease_OnException(pUnk, pRCW -#ifdef MDA_SUPPORTED - , pProbe -#endif // MDA_SUPPORTED - ); + SafeRelease_OnException(pUnk, pRCW); } GCX_PREEMP_NO_DTOR_END(); @@ -4110,10 +4073,6 @@ static void DoIUInvokeDispMethod(IDispatchEx* pDispEx, IDispatch* pDisp, DISPID memset(&ExcepInfo, 0, sizeof(EXCEPINFO)); -#ifdef MDA_SUPPORTED - MDA_TRIGGER_ASSISTANT(GcManagedToUnmanaged, TriggerGC()); -#endif - GCX_COOP(); OBJECTREF pThrowable = NULL; GCPROTECT_BEGIN(pThrowable); @@ -4137,17 +4096,6 @@ static void DoIUInvokeDispMethod(IDispatchEx* pDispEx, IDispatch* pDisp, DISPID } } -#ifdef MDA_SUPPORTED - EX_TRY - { - MDA_TRIGGER_ASSISTANT(GcUnmanagedToManaged, TriggerGC()); - } - EX_CATCH - { - } - EX_END_CATCH(RethrowTerminalExceptions); -#endif - // If the invoke call failed then throw an exception based on the EXCEPINFO. if (FAILED(hr)) { |