RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 13:11:39 +01:00
Code Issues Projects Releases Wiki Activity

ManagedStatic is never built with a null constructor, remove support for it.

Browse Source 
llvm-svn: 206492
This commit is contained in:
David Blaikie 2014-04-17 20:30:35 +00:00
parent 77edcc9a3a
commit d2e576d088
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Support/ManagedStatic.cpp
View File

@ -21,11 +21,12 @@ static const ManagedStaticBase *StaticList = nullptr;
void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(), void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
void (*Deleter)(void*)) const { void (*Deleter)(void*)) const {
assert(Creator);
if (llvm_is_multithreaded()) { if (llvm_is_multithreaded()) {
llvm_acquire_global_lock(); llvm_acquire_global_lock();
if (!Ptr) { if (!Ptr) {
void* tmp = Creator ? Creator() : nullptr; void* tmp = Creator();
TsanHappensBefore(this); TsanHappensBefore(this);
sys::MemoryFence(); sys::MemoryFence();
@ -47,7 +48,7 @@ void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(),
} else { } else {
assert(!Ptr && !DeleterFn && !Next && assert(!Ptr && !DeleterFn && !Next &&
"Partially initialized ManagedStatic!?"); "Partially initialized ManagedStatic!?");
Ptr = Creator ? Creator() : nullptr; Ptr = Creator();
DeleterFn = Deleter; DeleterFn = Deleter;
// Add to list of managed statics. // Add to list of managed statics.