From a61bb4d19899d68901e0ec4dd01b0f53062c6ec1 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 12 Mar 2009 03:07:24 +0000 Subject: Fix uninitialized use in GetAddrOfGlobalBlock, reenable assert. - Mike, please verify. llvm-svn: 66762 --- clang/lib/CodeGen/CGBlocks.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CGBlocks.cpp') diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index f10f0159e2e..53e52ad478a 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -557,7 +557,7 @@ BlockModule::GetAddrOfGlobalBlock(const BlockExpr *BE, const char * n) { CodeGenFunction::BlockInfo Info(0, n); uint64_t subBlockSize, subBlockAlign; llvm::SmallVector subBlockDeclRefDecls; - bool subBlockHasCopyDispose; + bool subBlockHasCopyDispose = false; llvm::Function *Fn = CodeGenFunction(CGM).GenerateBlockFunction(BE, Info, subBlockSize, subBlockAlign, @@ -567,7 +567,7 @@ BlockModule::GetAddrOfGlobalBlock(const BlockExpr *BE, const char * n) { && "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(); -- cgit v1.2.3