From c8151294df60746dba73bca1a91d6239f05fae2f Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Fri, 3 Apr 2020 10:56:03 +0200 Subject: [PATCH] Fix Unix build break --- src/coreclr/src/vm/threadsuspend.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/coreclr/src/vm/threadsuspend.cpp b/src/coreclr/src/vm/threadsuspend.cpp index 6c91b9a..7a4234a 100644 --- a/src/coreclr/src/vm/threadsuspend.cpp +++ b/src/coreclr/src/vm/threadsuspend.cpp @@ -6646,6 +6646,11 @@ void HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) if (executionState.m_ppvRetAddrPtr == NULL) return; + void *pvHijackAddr; + if (!GetReturnAddressHijackInfo(pThread, &codeInfo, &pvHijackAddr)) + { + return; + } // Calling this turns off the GC_TRIGGERS/THROWS/INJECT_FAULT contract in LoadTypeHandle. // We should not trigger any loads for unresolved types. @@ -6656,7 +6661,6 @@ void HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) StackWalkerWalkingThreadHolder threadStackWalking(pThread); // Hijack the return address to point to the appropriate routine based on the method's return type. - void *pvHijackAddr = GetHijackAddr(pThread, &codeInfo); pThread->HijackThread(pvHijackAddr, &executionState); } } -- 2.7.4