diff options
| author | Aditya Mandaleeka <adityam@microsoft.com> | 2015-10-19 18:21:36 -0700 |
|---|---|---|
| committer | Aditya Mandaleeka <adityam@microsoft.com> | 2015-10-19 18:25:19 -0700 |
| commit | 0786c55bf36321a49bb09b5d37a1b2d5f79fd9e9 (patch) | |
| tree | a144580e79ec67ddcdcc3eb343351fd85d736b79 /src/vm/corhost.cpp | |
| parent | 3015ff7afb4936a1c5c5856daa4e3482e6b390a9 (diff) | |
| download | coreclr-0786c55bf36321a49bb09b5d37a1b2d5f79fd9e9.tar.gz coreclr-0786c55bf36321a49bb09b5d37a1b2d5f79fd9e9.tar.bz2 coreclr-0786c55bf36321a49bb09b5d37a1b2d5f79fd9e9.zip | |
Revert some changed files from an incorrectly merged commit.
Commit 4cf34fe seems to have included some unintentional changes which are
affecting the product. This reverts those files to what they should be.
Diffstat (limited to 'src/vm/corhost.cpp')
| -rw-r--r-- | src/vm/corhost.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp index 451043fc45..161b2a1fae 100644 --- a/src/vm/corhost.cpp +++ b/src/vm/corhost.cpp @@ -1270,6 +1270,7 @@ HRESULT CorHost2::ExecuteAssembly(DWORD dwAppDomainId, return HOST_E_INVALIDOPERATION; } + INSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP; INSTALL_UNWIND_AND_CONTINUE_HANDLER; _ASSERTE (!pThread->PreemptiveGCDisabled()); @@ -1302,6 +1303,7 @@ HRESULT CorHost2::ExecuteAssembly(DWORD dwAppDomainId, } UNINSTALL_UNWIND_AND_CONTINUE_HANDLER; + UNINSTALL_UNHANDLED_MANAGED_EXCEPTION_TRAP; ErrExit: |