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/utilcode | |
| 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/utilcode')
| -rw-r--r-- | src/utilcode/clrhost_nodependencies.cpp | 6 | ||||
| -rw-r--r-- | src/utilcode/hostimpl.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/utilcode/clrhost_nodependencies.cpp b/src/utilcode/clrhost_nodependencies.cpp index 967963a55c..b9bb344300 100644 --- a/src/utilcode/clrhost_nodependencies.cpp +++ b/src/utilcode/clrhost_nodependencies.cpp @@ -746,15 +746,15 @@ void ClrFlsAssociateCallback(DWORD slot, PTLS_CALLBACK_FUNCTION callback) GetExecutionEngine()->TLS_AssociateCallback(slot, callback); } -void * __stdcall ClrFlsGetBlockGeneric() +void ** __stdcall ClrFlsGetBlockGeneric() { WRAPPER_NO_CONTRACT; STATIC_CONTRACT_SO_TOLERANT; - return GetExecutionEngine()->TLS_GetDataBlock(); + return (void **) GetExecutionEngine()->TLS_GetDataBlock(); } -POPTIMIZEDTLSGETTER __ClrFlsGetBlock = (POPTIMIZEDTLSGETTER)ClrFlsGetBlockGeneric; +CLRFLSGETBLOCK __ClrFlsGetBlock = ClrFlsGetBlockGeneric; CRITSEC_COOKIE ClrCreateCriticalSection(CrstType crstType, CrstFlags flags) { diff --git a/src/utilcode/hostimpl.cpp b/src/utilcode/hostimpl.cpp index 582189c618..c1aa6f0350 100644 --- a/src/utilcode/hostimpl.cpp +++ b/src/utilcode/hostimpl.cpp @@ -32,14 +32,14 @@ static PTLS_CALLBACK_FUNCTION Callbacks[MAX_PREDEFINED_TLS_SLOT]; HANDLE (*g_fnGetExecutableHeapHandle)(); #endif -extern LPVOID (*__ClrFlsGetBlock)(); +extern LPVOID* (*__ClrFlsGetBlock)(); // // FLS getter to avoid unnecessary indirection via execution engine. // -VOID * ClrFlsGetBlockDirect() +LPVOID* ClrFlsGetBlockDirect() { - return UnsafeTlsGetValue(TlsIndex); + return (LPVOID*)UnsafeTlsGetValue(TlsIndex); } // |