6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-05 13:26:55 +00:00
Code Issues Projects Releases Wiki Activity

For llvm::sys::ThreadLocalImpl instead of malloc'ing the platform-specific

Browse Source 
thread local data, embed them in the class using a uint64_t and make sure
we get compiler errors if there's a platform where this is not big enough.

This makes ThreadLocal more safe for using it in conjunction with CrashRecoveryContext.

Related to crash in rdar://11434201.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158342 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Argyrios Kyrtzidis
2012-06-12 00:21:31 +00:00
parent 0eb3a3524e
commit 793537d21f
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Support/ThreadLocal.cpp
View File

@@ -41,30 +41,29 @@ namespace llvm {
using namespace sys;
ThreadLocalImpl::ThreadLocalImpl() : data(0) {
pthread_key_t* key = new pthread_key_t;
typedef int SIZE_TOO_BIG[sizeof(pthread_key_t) <= sizeof(data) ? 1 : -1];
pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
int errorcode = pthread_key_create(key, NULL);
assert(errorcode == 0);
(void) errorcode;
data = (void*)key;
}
ThreadLocalImpl::~ThreadLocalImpl() {
pthread_key_t* key = static_cast<pthread_key_t*>(data);
pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
int errorcode = pthread_key_delete(*key);
assert(errorcode == 0);
(void) errorcode;
delete key;
}
void ThreadLocalImpl::setInstance(const void* d) {
pthread_key_t* key = static_cast<pthread_key_t*>(data);
pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
int errorcode = pthread_setspecific(*key, d);
assert(errorcode == 0);
(void) errorcode;
}
const void* ThreadLocalImpl::getInstance() {
pthread_key_t* key = static_cast<pthread_key_t*>(data);
pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data);
return pthread_getspecific(*key);
}

13
lib/Support/Windows/ThreadLocal.inc
View File

@@ -22,26 +22,25 @@
namespace llvm {
using namespace sys;
ThreadLocalImpl::ThreadLocalImpl() {
DWORD* tls = new DWORD;
ThreadLocalImpl::ThreadLocalImpl() : data(0) {
typedef int SIZE_TOO_BIG[sizeof(DWORD) <= sizeof(data) ? 1 : -1];
DWORD* tls = reinterpret_cast<DWORD*>(&data);
*tls = TlsAlloc();
assert(*tls != TLS_OUT_OF_INDEXES);
data = tls;
}
ThreadLocalImpl::~ThreadLocalImpl() {
DWORD* tls = static_cast<DWORD*>(data);
DWORD* tls = reinterpret_cast<DWORD*>(&data);
TlsFree(*tls);
delete tls;
}
const void* ThreadLocalImpl::getInstance() {
DWORD* tls = static_cast<DWORD*>(data);
DWORD* tls = reinterpret_cast<DWORD*>(&data);
return TlsGetValue(*tls);
}
void ThreadLocalImpl::setInstance(const void* d){
DWORD* tls = static_cast<DWORD*>(data);
DWORD* tls = reinterpret_cast<DWORD*>(&data);
int errorcode = TlsSetValue(*tls, const_cast<void*>(d));
assert(errorcode != 0);
(void)errorcode;