From 230203c9499991eb28f8926d0c96fe0b55b82ccb Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Thu, 10 Jan 2013 01:46:29 +0000 Subject: Don't assert in codegen on static data members which have NoLinkage. Fixes PR14825! llvm-svn: 172031 --- clang/lib/CodeGen/CGExpr.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clang/lib/CodeGen/CGExpr.cpp') diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index e5f9672b0f8..c002bb1432d 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -1583,8 +1583,6 @@ EmitBitCastOfLValueToProperType(CodeGenFunction &CGF, static LValue EmitGlobalVarDeclLValue(CodeGenFunction &CGF, const Expr *E, const VarDecl *VD) { - assert(VD->hasLinkage() && "Var decl must have linkage!"); - llvm::Value *V = CGF.CGM.GetAddrOfGlobalVar(VD); llvm::Type *RealVarTy = CGF.getTypes().ConvertTypeForMem(VD->getType()); V = EmitBitCastOfLValueToProperType(CGF, V, RealVarTy); @@ -1657,7 +1655,7 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) { if (const VarDecl *VD = dyn_cast(ND)) { // Check if this is a global variable. - if (VD->hasLinkage()) + if (VD->hasLinkage() || VD->isStaticDataMember()) return EmitGlobalVarDeclLValue(*this, E, VD); bool isBlockVariable = VD->hasAttr(); @@ -1666,7 +1664,7 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) { !VD->getType()->isReferenceType() && !isBlockVariable; - llvm::Value *V = LocalDeclMap[VD]; + llvm::Value *V = LocalDeclMap.lookup(VD); if (!V && VD->isStaticLocal()) V = CGM.getStaticLocalDeclAddress(VD); -- cgit v1.2.3