[llvm-branch-commits] [llvm-branch] r81030 - /llvm/branches/release_26/lib/VMCore/Type.cpp

[Tanya Lattner]

Author: tbrethou
Date: Fri Sep  4 14:27:52 2009
New Revision: 81030

URL: http://llvm.org/viewvc/llvm-project?rev=81030&view=rev
Log:
Merge 80780 from mainline.
Opaque types didn't work if llvm_is_multithreaded().
AlwaysOpaqueTy is always NULL at this point, and it causes an assertion failure.
Fix it by using the just constructed tmp instead.

Modified:
    llvm/branches/release_26/lib/VMCore/Type.cpp

Modified: llvm/branches/release_26/lib/VMCore/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/lib/VMCore/Type.cpp?rev=81030&r1=81029&r2=81030&view=diff

==============================================================================
--- llvm/branches/release_26/lib/VMCore/Type.cpp (original)
+++ llvm/branches/release_26/lib/VMCore/Type.cpp Fri Sep  4 14:27:52 2009
@@ -492,7 +492,7 @@
         tmp = AlwaysOpaqueTy;
         if (!tmp) {
           tmp = OpaqueType::get(getContext());
-          PATypeHolder* tmp2 = new PATypeHolder(AlwaysOpaqueTy);
+          PATypeHolder* tmp2 = new PATypeHolder(tmp);
           sys::MemoryFence();
           AlwaysOpaqueTy = tmp;
           Holder = tmp2;