From f96b428be160a3caf83b1fd6e92cdddd12b55098 Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Mon, 6 Apr 2020 15:13:27 +0200 Subject: [PATCH] Fix x86 build break and reflect PR feedback --- src/coreclr/src/vm/threadsuspend.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/src/vm/threadsuspend.cpp b/src/coreclr/src/vm/threadsuspend.cpp index 1b35a11..bcfb5cd 100644 --- a/src/coreclr/src/vm/threadsuspend.cpp +++ b/src/coreclr/src/vm/threadsuspend.cpp @@ -5293,7 +5293,7 @@ void Thread::HijackThread(ReturnKind returnKind, ExecutionState *esb) #ifdef TARGET_X86 if (returnKind == RT_Float) { - hijackAddress = reinterpret_cast(OnHijackFPTripThread); + pvHijackAddr = reinterpret_cast(OnHijackFPTripThread); } #endif // TARGET_X86 @@ -5625,7 +5625,7 @@ void STDCALL OnHijackWorker(HijackArgs * pArgs) #endif // HIJACK_NONINTERRUPTIBLE_THREADS } -bool GetReturnAddressHijackInfo(Thread *pThread, EECodeInfo *pCodeInfo, ReturnKind *pReturnKind) +static bool GetReturnAddressHijackInfo(EECodeInfo *pCodeInfo, ReturnKind *pReturnKind) { GCInfoToken gcInfoToken = pCodeInfo->GetGCInfoToken(); return pCodeInfo->GetCodeManager()->GetReturnAddressHijackInfo(gcInfoToken, pReturnKind); @@ -6086,7 +6086,7 @@ BOOL Thread::HandledJITCase(BOOL ForTaskSwitchIn) ReturnKind returnKind; - if (GetReturnAddressHijackInfo(this, &codeInfo, &returnKind)) + if (GetReturnAddressHijackInfo(&codeInfo, &returnKind)) { #ifdef FEATURE_ENABLE_GCPOLL @@ -6639,7 +6639,7 @@ void HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext) ReturnKind returnKind; - if (!GetReturnAddressHijackInfo(pThread, &codeInfo, &returnKind)) + if (!GetReturnAddressHijackInfo(&codeInfo, &returnKind)) { return; } -- 2.7.4