From 31305c55d32735c626513373e4d7fe5e8d1e927f Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Mon, 24 Aug 2015 19:24:13 -0700 Subject: [PATCH] Detect whether we interrupted an epilog properly --- src/vm/threadsuspend.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp index 0ac90f7..be220f3 100644 --- a/src/vm/threadsuspend.cpp +++ b/src/vm/threadsuspend.cpp @@ -8314,7 +8314,8 @@ void PALAPI HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) REGDISPLAY regDisplay; pThread->InitRegDisplay(®Display, interruptedContext, true /* validContext */); - if (!pThread->IsSafeToInjectThreadAbort(interruptedContext)) + BOOL unused; + if (IsIPInEpilog(interruptedContext, &codeInfo, &unused)) return; // Use StackWalkFramesEx to find the location of the return address. This will locate the -- 2.7.4