[cfe-commits] r64473 - in /cfe/trunk/lib/CodeGen: CGBlocks.cpp CodeGenModule.cpp CodeGenModule.h
Mike Stump
mrs at apple.com
Fri Feb 13 10:36:05 PST 2009
Author: mrs
Date: Fri Feb 13 12:36:05 2009
New Revision: 64473
URL: http://llvm.org/viewvc/llvm-project?rev=64473&view=rev
Log:
Move GlobalUniqueCount up into CGM.
Modified:
cfe/trunk/lib/CodeGen/CGBlocks.cpp
cfe/trunk/lib/CodeGen/CodeGenModule.cpp
cfe/trunk/lib/CodeGen/CodeGenModule.h
Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.cpp?rev=64473&r1=64472&r2=64473&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBlocks.cpp Fri Feb 13 12:36:05 2009
@@ -154,9 +154,7 @@
C = llvm::ConstantStruct::get(Elts);
char Name[32];
- // FIXME: Boost in CGM?
- static int global_unique_count;
- sprintf(Name, "__block_holder_tmp_%d", ++global_unique_count);
+ sprintf(Name, "__block_holder_tmp_%d", CGM.getGlobalUniqueCount());
C = new llvm::GlobalVariable(C->getType(), true,
llvm::GlobalValue::InternalLinkage,
C, Name, &CGM.getModule());
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=64473&r1=64472&r2=64473&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri Feb 13 12:36:05 2009
@@ -49,7 +49,9 @@
}
// If debug info generation is enabled, create the CGDebugInfo object.
- DebugInfo = GenerateDebugInfo ? new CGDebugInfo(this) : 0;
+ DebugInfo = GenerateDebugInfo ? new CGDebugInfo(this) : 0;
+
+ Block.GlobalUniqueCount = 0;
}
CodeGenModule::~CodeGenModule() {
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.h?rev=64473&r1=64472&r2=64473&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.h Fri Feb 13 12:36:05 2009
@@ -129,6 +129,9 @@
const llvm::Type *BlockDescriptorType;
const llvm::Type * GenericBlockLiteralType;
+ struct {
+ int GlobalUniqueCount;
+ } Block;
std::vector<llvm::Function *> BuiltinFunctions;
public:
@@ -142,7 +145,7 @@
void Release();
llvm::Constant *getNSConcreteGlobalBlock();
-
+ int getGlobalUniqueCount() { return ++Block.GlobalUniqueCount; }
const llvm::Type *getBlockDescriptorType();
const llvm::Type *getGenericBlockLiteralType();
More information about the cfe-commits
mailing list