From 2a998148a6823c44d67da347c95eb2ea21f6b986 Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Wed, 4 Mar 2009 18:17:45 +0000 Subject: Move more of blocks codegen out of CodeGenModule and into the BlockModule. No functionality change. This should help people that don't want to know anything about blocks not be confused by the overloaded use of the term block or nor want to see all the blocks goop. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66042 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib/CodeGen/CodeGenModule.cpp') diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 33aff2553f..c0dba74ad0 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -34,10 +34,9 @@ using namespace CodeGen; CodeGenModule::CodeGenModule(ASTContext &C, const LangOptions &LO, llvm::Module &M, const llvm::TargetData &TD, Diagnostic &diags, bool GenerateDebugInfo) - : Context(C), Features(LO), TheModule(M), TheTargetData(TD), Diags(diags), - Types(C, M, TD), Runtime(0), MemCpyFn(0), MemMoveFn(0), MemSetFn(0), - CFConstantStringClassRef(0), NSConcreteGlobalBlock(0), - NSConcreteStackBlock(0),BlockDescriptorType(0), GenericBlockLiteralType(0) { + : BlockModule(C, M, Types), Context(C), Features(LO), TheModule(M), + TheTargetData(TD), Diags(diags), Types(C, M, TD), Runtime(0), + MemCpyFn(0), MemMoveFn(0), MemSetFn(0), CFConstantStringClassRef(0) { if (Features.ObjC1) { if (Features.NeXTRuntime) { @@ -50,8 +49,6 @@ CodeGenModule::CodeGenModule(ASTContext &C, const LangOptions &LO, // If debug info generation is enabled, create the CGDebugInfo object. DebugInfo = GenerateDebugInfo ? new CGDebugInfo(this) : 0; - - Block.GlobalUniqueCount = 0; } CodeGenModule::~CodeGenModule() { -- cgit v1.2.3-18-g5258