diff options
| -rw-r--r-- | lib/VMCore/Pass.cpp | 11 | ||||
| -rw-r--r-- | lib/VMCore/Type.cpp | 18 |
2 files changed, 15 insertions, 14 deletions
diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp index 3fce83d..e943e31 100644 --- a/lib/VMCore/Pass.cpp +++ b/lib/VMCore/Pass.cpp @@ -198,9 +198,9 @@ static PassRegistrar *getPassRegistrar() { // Use double-checked locking to safely initialize the registrar when // we're running in multithreaded mode. PassRegistrar* tmp = PassRegistrarObj; - sys::MemoryFence(); - if (!tmp) { - if (llvm_is_multithreaded()) { + if (llvm_is_multithreaded()) { + sys::MemoryFence(); + if (!tmp) { llvm_acquire_global_lock(); tmp = PassRegistrarObj; if (!tmp) { @@ -209,10 +209,11 @@ static PassRegistrar *getPassRegistrar() { PassRegistrarObj = tmp; } llvm_release_global_lock(); - } else { - PassRegistrarObj = new PassRegistrar(); } + } else if (!tmp) { + PassRegistrarObj = new PassRegistrar(); } + return PassRegistrarObj; } diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index 66eb10a..5df7f12 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -458,9 +458,9 @@ void DerivedType::dropAllTypeUses() { static Type *AlwaysOpaqueTy = 0; static PATypeHolder* Holder = 0; Type *tmp = AlwaysOpaqueTy; - sys::MemoryFence(); - if (!tmp) { - if (llvm_is_multithreaded()) { + if (llvm_is_multithreaded()) { + sys::MemoryFence(); + if (!tmp) { llvm_acquire_global_lock(); tmp = AlwaysOpaqueTy; if (!tmp) { @@ -472,12 +472,12 @@ void DerivedType::dropAllTypeUses() { } llvm_release_global_lock(); - } else { - AlwaysOpaqueTy = OpaqueType::get(); - Holder = new PATypeHolder(AlwaysOpaqueTy); - } - } - + } + } else { + AlwaysOpaqueTy = OpaqueType::get(); + Holder = new PATypeHolder(AlwaysOpaqueTy); + } + ContainedTys[0] = AlwaysOpaqueTy; // Change the rest of the types to be Int32Ty's. It doesn't matter what we |