[cfe-commits] r66762 - /cfe/trunk/lib/CodeGen/CGBlocks.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Mar 11 22:07:24 2009
New Revision: 66762

URL: http://llvm.org/viewvc/llvm-project?rev=66762&view=rev
Log:
Fix uninitialized use in GetAddrOfGlobalBlock, reenable assert.
 - Mike, please verify.

Modified:
    cfe/trunk/lib/CodeGen/CGBlocks.cpp

Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.cpp?rev=66762&r1=66761&r2=66762&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBlocks.cpp Wed Mar 11 22:07:24 2009
@@ -557,7 +557,7 @@
   CodeGenFunction::BlockInfo Info(0, n);
   uint64_t subBlockSize, subBlockAlign;
   llvm::SmallVector<const Expr *, 8> subBlockDeclRefDecls;
-  bool subBlockHasCopyDispose;
+  bool subBlockHasCopyDispose = false;
   llvm::Function *Fn
     = CodeGenFunction(CGM).GenerateBlockFunction(BE, Info, subBlockSize,
                                                  subBlockAlign,
@@ -567,7 +567,7 @@
          && "no imports allowed for global block");
   // FIXME: This causes a failure on clang-i686-linux, not sure why,
   // disable for now.
-  // assert(!subBlockHasCopyDispose && "no imports allowed for global block");
+  assert(!subBlockHasCopyDispose && "no imports allowed for global block");
 
   // isa
   LiteralFields[0] = getNSConcreteGlobalBlock();