diff options
-rw-r--r-- | CodeGen/CGDecl.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CodeGen/CGDecl.cpp b/CodeGen/CGDecl.cpp index a6c5da7c26..b6f9c7cbd6 100644 --- a/CodeGen/CGDecl.cpp +++ b/CodeGen/CGDecl.cpp @@ -81,10 +81,17 @@ void CodeGenFunction::EmitStaticBlockVarDecl(const BlockVarDecl &D) { assert(Init && "Unable to create initialiser for static decl"); + std::string ContextName; + if (CurFuncDecl) + ContextName = CurFuncDecl->getName(); + else + assert(0 && "Unknown context for block var decl"); // FIXME Handle objc. + DMEntry = new llvm::GlobalVariable(LTy, false, llvm::GlobalValue::InternalLinkage, - Init, D.getName(), &CGM.getModule(), 0, + Init, ContextName + "." + D.getName(), + &CGM.getModule(), 0, Ty.getAddressSpace()); } |