diff options
author | Mike McLaughlin <mikem@microsoft.com> | 2015-04-15 16:59:56 -0700 |
---|---|---|
committer | Mike McLaughlin <mikem@microsoft.com> | 2015-04-22 20:42:31 -0700 |
commit | d5012a8471ebf16265951fb199eb58ec6d33116b (patch) | |
tree | b1b67d5cdfb5d12a4963177cc9a1bcde0b0b8fac /src/vm | |
parent | 48b911e5fab33b41f3a2021ccd051eb7a99a2fbd (diff) | |
download | coreclr-d5012a8471ebf16265951fb199eb58ec6d33116b.tar.gz coreclr-d5012a8471ebf16265951fb199eb58ec6d33116b.tar.bz2 coreclr-d5012a8471ebf16265951fb199eb58ec6d33116b.zip |
Changed the VM's hardware exception to return if not in manged code. For DAC's hardware exception handling, add
hardware exception holder used to determine if a C++ exception should be thrown for a hardware exception. Cleaned
up PAL initialization interactions between the debugger modules (PAL_InitializeDLL) and coreclr (PAL_InitializeCoreCLR).
Diffstat (limited to 'src/vm')
-rw-r--r-- | src/vm/exceptionhandling.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index c3399e340a..2fe593c804 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -4985,8 +4985,6 @@ VOID PALAPI HandleHardwareException(PAL_SEHException* ex) } UNREACHABLE(); } - - _ASSERTE(!"HandleHardwareException: Hardware exception happened out of managed code"); } else { @@ -5015,7 +5013,6 @@ VOID PALAPI HandleHardwareException(PAL_SEHException* ex) } } } - EEPOLICY_HANDLE_FATAL_ERROR(COR_E_EXECUTIONENGINE); } #endif // FEATURE_PAL |