From 09a9b6e33524a9dc1c23f38adb146f61b64b8ff0 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sat, 28 Mar 2009 03:24:54 +0000 Subject: Move where block-related variables are initialized so that block types don't get generated when blocks aren't used. llvm-svn: 67898 --- clang/lib/CodeGen/CGBlocks.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'clang/lib/CodeGen/CGBlocks.cpp') diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index db1539bd632..16e926ba643 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -625,6 +625,16 @@ CodeGenFunction::GenerateBlockFunction(const BlockExpr *BExpr, LocalDeclMap[VD] = i->second; } + // FIXME: We need to rearrange the code for copy/dispose so we have this + // sooner, so we can calculate offsets correctly. + if (!BlockHasCopyDispose) + BlockOffset = CGM.getTargetData() + .getTypeStoreSizeInBits(CGM.getGenericBlockLiteralType()) / 8; + else + BlockOffset = CGM.getTargetData() + .getTypeStoreSizeInBits(CGM.getGenericExtendedBlockLiteralType()) / 8; + BlockAlign = getContext().getTypeAlign(getContext().VoidPtrTy) / 8; + const FunctionProtoType *FTy = cast(BExpr->getFunctionType()); -- cgit v1.2.3