[cfe-commits] r172031 - in /cfe/trunk: lib/CodeGen/CGExpr.cpp test/CodeGenCXX/template-linkage.cpp
Nick Lewycky
nicholas at mxc.ca
Wed Jan 9 17:46:29 PST 2013
Author: nicholas
Date: Wed Jan 9 19:46:29 2013
New Revision: 172031
URL: http://llvm.org/viewvc/llvm-project?rev=172031&view=rev
Log:
Don't assert in codegen on static data members which have NoLinkage. Fixes
PR14825!
Modified:
cfe/trunk/lib/CodeGen/CGExpr.cpp
cfe/trunk/test/CodeGenCXX/template-linkage.cpp
Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=172031&r1=172030&r2=172031&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Wed Jan 9 19:46:29 2013
@@ -1583,8 +1583,6 @@
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 @@
if (const VarDecl *VD = dyn_cast<VarDecl>(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<BlocksAttr>();
@@ -1666,7 +1664,7 @@
!VD->getType()->isReferenceType() &&
!isBlockVariable;
- llvm::Value *V = LocalDeclMap[VD];
+ llvm::Value *V = LocalDeclMap.lookup(VD);
if (!V && VD->isStaticLocal())
V = CGM.getStaticLocalDeclAddress(VD);
Modified: cfe/trunk/test/CodeGenCXX/template-linkage.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/template-linkage.cpp?rev=172031&r1=172030&r2=172031&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/template-linkage.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/template-linkage.cpp Wed Jan 9 19:46:29 2013
@@ -1,4 +1,7 @@
// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+
+// CHECK: Outer5Inner{{.*}}localE6memberE = external global
+
template<typename T> struct A {
virtual void f(T) { }
inline void g() { }
@@ -42,3 +45,20 @@
X1<char> i1c;
}
+namespace PR14825 {
+struct Outer {
+ template <typename T> struct Inner {
+ static int member;
+ };
+ template <typename T> void Get() {
+ int m = Inner<T>::member;
+ }
+};
+
+void test() {
+ struct local {};
+ Outer o;
+ typedef void (Outer::*mptr)();
+ mptr method = &Outer::Get<local>;
+}
+}
More information about the cfe-commits
mailing list