diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2016-06-04 09:36:40 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2016-06-04 09:36:40 +0000 |
| commit | fe9466fe2ce7ac9b50c09b3f3c2d14370147f4dc (patch) | |
| tree | 1a8fd940cb97cc9869232214c3336210a93758ba /llvm/lib/Support | |
| parent | 7573cfe2b39dacb9c8e84478d7868e6a371c98a3 (diff) | |
| download | bcm5719-llvm-fe9466fe2ce7ac9b50c09b3f3c2d14370147f4dc.tar.gz bcm5719-llvm-fe9466fe2ce7ac9b50c09b3f3c2d14370147f4dc.zip | |
[LPM] Revert r271781 which was a re-commit of r271652.
There appears to be a strange exception thrown and crash using call_once
on a PPC build bot, and a *really* weird windows link error for
GCMetadata.obj. Still need to investigate the cause of both problems.
Original change summary:
[LPM] Reinstate r271652 to replace the CALL_ONCE_... macro in the legacy
pass manager with the new llvm::call_once facility.
llvm-svn: 271788
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/ManagedStatic.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Threading.cpp | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/llvm/lib/Support/ManagedStatic.cpp b/llvm/lib/Support/ManagedStatic.cpp index bc4fe954e22..b1feddc09ec 100644 --- a/llvm/lib/Support/ManagedStatic.cpp +++ b/llvm/lib/Support/ManagedStatic.cpp @@ -32,7 +32,7 @@ static sys::Mutex* getManagedStaticMutex() { // We need to use a function local static here, since this can get called // during a static constructor and we need to guarantee that it's initialized // correctly. - llvm::call_once(mutex_init_flag, initializeMutex); + call_once(mutex_init_flag, initializeMutex); return ManagedStaticMutex; } diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp index e8f5622d0e5..de2ff6b4fae 100644 --- a/llvm/lib/Support/Threading.cpp +++ b/llvm/lib/Support/Threading.cpp @@ -116,3 +116,30 @@ void llvm::llvm_execute_on_thread(void (*Fn)(void*), void *UserData, } #endif + +void llvm::call_once(once_flag &flag, void (*fptr)(void)) { +#if LLVM_THREADING_USE_STD_CALL_ONCE + std::call_once(flag, fptr); +#else + // For other platforms we use a generic (if brittle) version based on our + // atomics. + sys::cas_flag old_val = sys::CompareAndSwap(&flag, Wait, Uninitialized); + if (old_val == Uninitialized) { + fptr(); + sys::MemoryFence(); + TsanIgnoreWritesBegin(); + TsanHappensBefore(&flag); + flag = Done; + TsanIgnoreWritesEnd(); + } else { + // Wait until any thread doing the call has finished. + sys::cas_flag tmp = flag; + sys::MemoryFence(); + while (tmp != Done) { + tmp = flag; + sys::MemoryFence(); + } + } + TsanHappensAfter(&flag); +#endif +} |

