From b285e42989730fc6c2a75478ede4348f18bc93b3 Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Mon, 3 Dec 2018 10:17:20 -0800 Subject: [PATCH] Make sure the debug registers are available in the SavedRedirectContext (#21293) --- src/vm/threadsuspend.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp index f33d38e..bd365d1 100644 --- a/src/vm/threadsuspend.cpp +++ b/src/vm/threadsuspend.cpp @@ -3830,7 +3830,7 @@ void __stdcall Thread::RedirectedHandledJITCaseForGCStress() #define CONTEXT_COMPLETE (CONTEXT_FULL | CONTEXT_FLOATING_POINT | \ CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS | CONTEXT_EXCEPTION_REQUEST) #else -#define CONTEXT_COMPLETE (CONTEXT_FULL | CONTEXT_EXCEPTION_REQUEST) +#define CONTEXT_COMPLETE (CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXCEPTION_REQUEST) #endif BOOL Thread::RedirectThreadAtHandledJITCase(PFN_REDIRECTTARGET pTgt) @@ -5129,7 +5129,7 @@ BOOL Thread::HandleJITCaseForAbort() _ASSERTE (m_fPreemptiveGCDisabled); CONTEXT ctx; - ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_EXCEPTION_REQUEST; + ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXCEPTION_REQUEST; BOOL success = EEGetThreadContext(this, &ctx); _ASSERTE(success && "Thread::HandleJITCaseForAbort : Failed to get thread context"); -- 2.7.4