diff options
| author | Steve Harter <sharter@microsoft.com> | 2016-01-22 16:57:00 -0600 |
|---|---|---|
| committer | Steve Harter <sharter@microsoft.com> | 2016-01-25 14:19:19 -0600 |
| commit | 9f4239858090398c3c6af5bc31de6dbf1b2c74b8 (patch) | |
| tree | bbe4fde37c213d95795d1630c2e146b47861b06e /src/vm/threads.cpp | |
| parent | 7ed6f3854de81a1177440295f8d7d6dc3aada65d (diff) | |
| download | coreclr-9f4239858090398c3c6af5bc31de6dbf1b2c74b8.tar.gz coreclr-9f4239858090398c3c6af5bc31de6dbf1b2c74b8.tar.bz2 coreclr-9f4239858090398c3c6af5bc31de6dbf1b2c74b8.zip | |
Clang sanitizer fixes to remove incorrect function type 'void *(*)()'
Diffstat (limited to 'src/vm/threads.cpp')
| -rw-r--r-- | src/vm/threads.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/threads.cpp b/src/vm/threads.cpp index 719332a014..f012c3c546 100644 --- a/src/vm/threads.cpp +++ b/src/vm/threads.cpp @@ -1526,11 +1526,11 @@ AppDomain* STDCALL GetAppDomainGeneric() // FLS getter to avoid unnecessary indirection via execution engine. It will be used if we get high TLS slot // from the OS where we cannot use the fast optimized assembly helpers. (It happens pretty often in hosted scenarios). // -VOID * ClrFlsGetBlockDirect() +LPVOID* ClrFlsGetBlockDirect() { LIMITED_METHOD_CONTRACT; - return UnsafeTlsGetValue(CExecutionEngine::GetTlsIndex()); + return (LPVOID*)UnsafeTlsGetValue(CExecutionEngine::GetTlsIndex()); } extern "C" void * ClrFlsGetBlock(); @@ -1660,10 +1660,10 @@ void InitThreadManager() CExecutionEngine::CheckThreadState(0, FALSE); DWORD masterSlotIndex = CExecutionEngine::GetTlsIndex(); - POPTIMIZEDTLSGETTER pGetter = MakeOptimizedTlsGetter(masterSlotIndex, (PVOID)ClrFlsGetBlock, TLS_GETTER_MAX_SIZE); + CLRFLSGETBLOCK pGetter = (CLRFLSGETBLOCK)MakeOptimizedTlsGetter(masterSlotIndex, (PVOID)ClrFlsGetBlock, TLS_GETTER_MAX_SIZE); __ClrFlsGetBlock = pGetter ? pGetter : ClrFlsGetBlockDirect; #else - __ClrFlsGetBlock = (POPTIMIZEDTLSGETTER) CExecutionEngine::GetTlsData; + __ClrFlsGetBlock = CExecutionEngine::GetTlsData; #endif // FEATURE_IMPLICIT_TLS IfFailThrow(Thread::CLRSetThreadStackGuarantee(Thread::STSGuarantee_Force)); |