From 1cdbc5404b408dfe241392dc9c2d25bece69178d Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 25 Feb 2009 20:08:33 +0000 Subject: Allow constant initializers to reference their defining decl. - PR3662. llvm-svn: 65472 --- clang/lib/CodeGen/CGDecl.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'clang/lib/CodeGen/CGDecl.cpp') diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index 349656f58b8..ee2516a8508 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/lib/CodeGen/CGDecl.cpp @@ -106,6 +106,10 @@ void CodeGenFunction::EmitStaticBlockVarDecl(const VarDecl &D) { llvm::GlobalVariable *GV = CreateStaticBlockVarDecl(D, ".", llvm::GlobalValue::InternalLinkage); + // Store into LocalDeclMap before generating initializer to handle + // circular references. + DMEntry = GV; + if (D.getInit()) { llvm::Constant *Init = CGM.EmitConstantExpr(D.getInit(), this); @@ -162,6 +166,11 @@ void CodeGenFunction::EmitStaticBlockVarDecl(const VarDecl &D) { if (D.getAttr()) CGM.AddUsedGlobal(GV); + // We may have to cast the constant because of the initializer + // mismatch above. + // + // FIXME: It is really dangerous to store this in the map; if anyone + // RAUW's the GV uses of this constant will be invalid. const llvm::Type *LTy = CGM.getTypes().ConvertTypeForMem(D.getType()); const llvm::Type *LPtrTy = llvm::PointerType::get(LTy, D.getType().getAddressSpace()); -- cgit v1.2.3