From 438d3946afc9ba502d56269d1a1d2c18d38d7e23 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Thu, 25 Jun 2009 23:31:18 +0000 Subject: [PATCH] Add support for const thread locals. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74226 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/System/ThreadLocal.h | 4 ++-- lib/System/ThreadLocal.cpp | 8 ++++---- lib/System/Win32/ThreadLocal.inc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/llvm/System/ThreadLocal.h b/include/llvm/System/ThreadLocal.h index 7627be26d2e..39b1e64be0c 100644 --- a/include/llvm/System/ThreadLocal.h +++ b/include/llvm/System/ThreadLocal.h @@ -24,8 +24,8 @@ namespace llvm { public: ThreadLocalImpl(); virtual ~ThreadLocalImpl(); - void setInstance(void* d); - void* getInstance(); + void setInstance(const void* d); + const void* getInstance(); }; template diff --git a/lib/System/ThreadLocal.cpp b/lib/System/ThreadLocal.cpp index 74afa3e9538..f8b00d152a0 100644 --- a/lib/System/ThreadLocal.cpp +++ b/lib/System/ThreadLocal.cpp @@ -25,8 +25,8 @@ namespace llvm { using namespace sys; ThreadLocalImpl::ThreadLocalImpl() { } ThreadLocalImpl::~ThreadLocalImpl() { } -void ThreadLocalImpl::setInstance(void* d) { data = d; } -void* ThreadLocalImpl::getInstance() { return data; } +void ThreadLocalImpl::setInstance(const void* d) { data = const_cast(d);} +const void* ThreadLocalImpl::getInstance() { return data; } } #else @@ -53,13 +53,13 @@ ThreadLocalImpl::~ThreadLocalImpl() { delete key; } -void ThreadLocalImpl::setInstance(void* d) { +void ThreadLocalImpl::setInstance(const void* d) { pthread_key_t* key = static_cast(data); int errorcode = pthread_setspecific(*key, d); assert(errorcode == 0); } -void* ThreadLocalImpl::getInstance() { +const void* ThreadLocalImpl::getInstance() { pthread_key_t* key = static_cast(data); return pthread_getspecific(*key); } diff --git a/lib/System/Win32/ThreadLocal.inc b/lib/System/Win32/ThreadLocal.inc index 5bba8b58f90..0ba3be451e6 100644 --- a/lib/System/Win32/ThreadLocal.inc +++ b/lib/System/Win32/ThreadLocal.inc @@ -35,12 +35,12 @@ ThreadLocalImpl::~ThreadLocalImpl() { delete tls; } -void* ThreadLocalImpl::getInstance() { +const void* ThreadLocalImpl::getInstance() { DWORD* tls = static_cast(data); return TlsGetValue(*tls); } -void ThreadLocalImpl::setInstance(void* d){ +void ThreadLocalImpl::setInstance(const void* d){ DWORD* tls = static_cast(data); int errorcode = TlsSetValue(*tls, d); assert(errorcode == 0); -- 2.34.1