From 1d36e4fa7c608809e7ab93536ea198d0fb63b7c6 Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Thu, 18 Jun 2009 16:17:42 +0000
Subject: [PATCH] Fix the double checked locking in this file too.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73703 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/VMCore/Type.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index 0add0af3b84..b7adaddd9a1 100644
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -455,12 +455,14 @@ void DerivedType::dropAllTypeUses() {
     // that will never get resolved, thus will always be abstract.
     static Type *AlwaysOpaqueTy = 0;
     static PATypeHolder* Holder = 0;
-    if (!AlwaysOpaqueTy) {
+    Type *tmp = AlwaysOpaqueTy;
+    sys::MemoryFence();
+    if (!tmp) {
       if (llvm_is_multithreaded()) {
         llvm_acquire_global_lock();
-      
-        if (!AlwaysOpaqueTy) {
-          Type *tmp = OpaqueType::get();
+        tmp = AlwaysOpaqueTy;
+        if (!tmp) {
+          tmp = OpaqueType::get();
           PATypeHolder* tmp2 = new PATypeHolder(AlwaysOpaqueTy);
           sys::MemoryFence();
           AlwaysOpaqueTy = tmp;
-- 
2.34.1