From 39762951ad2abfed7b743c01c672fac85034b856 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Wed, 21 Oct 2009 21:01:47 +0000 Subject: Expand on code gen. for pointer to data members so it works for base classe members as well. Test case enhanced for this. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84780 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExpr.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/CodeGen/CGExpr.cpp') diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 2266b25c68..0b56fa94b7 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -1519,9 +1519,10 @@ LValue CodeGenFunction::EmitStmtExprLValue(const StmtExpr *E) { LValue CodeGenFunction::EmitPointerToDataMemberLValue( const QualifiedDeclRefExpr *E) { const FieldDecl *Field = cast(E->getDecl()); - const NestedNameSpecifier *NNSpec = E->getQualifier(); - const Type *NNSpecType = NNSpec->getAsType(); - QualType NNSpecTy = getContext().getCanonicalType(QualType(NNSpecType, 0)); + const CXXRecordDecl *ClassDecl = cast(Field->getDeclContext()); + QualType NNSpecTy = + getContext().getCanonicalType( + getContext().getTypeDeclType(const_cast(ClassDecl))); NNSpecTy = getContext().getPointerType(NNSpecTy); llvm::Value *V = llvm::Constant::getNullValue(ConvertType(NNSpecTy)); LValue MemExpLV = EmitLValueForField(V, const_cast(Field), -- cgit v1.2.3-70-g09d2