diff options
author | John Chen (CLR) <jochen@microsoft.com> | 2015-04-29 13:13:30 -0700 |
---|---|---|
committer | John Chen (CLR) <jochen@microsoft.com> | 2015-04-29 14:45:36 -0700 |
commit | 6058c71910eed8afd1ff57e4c51c9ad4ce623973 (patch) | |
tree | 3dc18b20c1a1a9de48ef8773158b61df7808b0c1 /src/vm/clrex.cpp | |
parent | 9579c444040a9fa9780b299cd536cb8ca1b8eaff (diff) | |
download | coreclr-6058c71910eed8afd1ff57e4c51c9ad4ce623973.tar.gz coreclr-6058c71910eed8afd1ff57e4c51c9ad4ce623973.tar.bz2 coreclr-6058c71910eed8afd1ff57e4c51c9ad4ce623973.zip |
Fix warnings introduced by crossgen
Diffstat (limited to 'src/vm/clrex.cpp')
-rw-r--r-- | src/vm/clrex.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/src/vm/clrex.cpp b/src/vm/clrex.cpp index 24ca7f05f1..cdf4eb8cc6 100644 --- a/src/vm/clrex.cpp +++ b/src/vm/clrex.cpp @@ -1363,55 +1363,6 @@ BOOL EEResourceException::GetThrowableMessage(SString &result) } // --------------------------------------------------------------------------- -// EEComException methods -// --------------------------------------------------------------------------- - -static HRESULT Undefer(EXCEPINFO *pExcepInfo) -{ - CONTRACTL - { - GC_NOTRIGGER; - NOTHROW; - MODE_ANY; - } - CONTRACTL_END; - - if (pExcepInfo->pfnDeferredFillIn) - { - EXCEPINFO FilledInExcepInfo; - - HRESULT hr = pExcepInfo->pfnDeferredFillIn(&FilledInExcepInfo); - if (SUCCEEDED(hr)) - { - // Free the strings in the original EXCEPINFO. - if (pExcepInfo->bstrDescription) - { - SysFreeString(pExcepInfo->bstrDescription); - pExcepInfo->bstrDescription = NULL; - } - if (pExcepInfo->bstrSource) - { - SysFreeString(pExcepInfo->bstrSource); - pExcepInfo->bstrSource = NULL; - } - if (pExcepInfo->bstrHelpFile) - { - SysFreeString(pExcepInfo->bstrHelpFile); - pExcepInfo->bstrHelpFile = NULL; - } - - // Fill in the new data - *pExcepInfo = FilledInExcepInfo; - } - } - - if (pExcepInfo->scode != 0) - return pExcepInfo->scode; - else - return (HRESULT)pExcepInfo->wCode; -} - -// --------------------------------------------------------------------------- // EEFieldException is an EE exception subclass composed of a field // --------------------------------------------------------------------------- @@ -2179,6 +2130,55 @@ void DECLSPEC_NORETURN EEFileLoadException::Throw(PEAssembly *parent, } #ifndef CROSSGEN_COMPILE +// --------------------------------------------------------------------------- +// EEComException methods +// --------------------------------------------------------------------------- + +static HRESULT Undefer(EXCEPINFO *pExcepInfo) +{ + CONTRACTL + { + GC_NOTRIGGER; + NOTHROW; + MODE_ANY; + } + CONTRACTL_END; + + if (pExcepInfo->pfnDeferredFillIn) + { + EXCEPINFO FilledInExcepInfo; + + HRESULT hr = pExcepInfo->pfnDeferredFillIn(&FilledInExcepInfo); + if (SUCCEEDED(hr)) + { + // Free the strings in the original EXCEPINFO. + if (pExcepInfo->bstrDescription) + { + SysFreeString(pExcepInfo->bstrDescription); + pExcepInfo->bstrDescription = NULL; + } + if (pExcepInfo->bstrSource) + { + SysFreeString(pExcepInfo->bstrSource); + pExcepInfo->bstrSource = NULL; + } + if (pExcepInfo->bstrHelpFile) + { + SysFreeString(pExcepInfo->bstrHelpFile); + pExcepInfo->bstrHelpFile = NULL; + } + + // Fill in the new data + *pExcepInfo = FilledInExcepInfo; + } + } + + if (pExcepInfo->scode != 0) + return pExcepInfo->scode; + else + return (HRESULT)pExcepInfo->wCode; +} + EECOMException::EECOMException(EXCEPINFO *pExcepInfo) : EEException(GetKindFromHR(Undefer(pExcepInfo))) { |