More work toward data member access ir-gen.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77332 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 48f69e4..b0e091b 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -993,6 +993,16 @@
if (PTy->getPointeeType()->isUnionType())
isUnion = true;
CVRQualifiers = PTy->getPointeeType().getCVRQualifiers();
+ if (CXXThisExpr *ThisExpr = dyn_cast<CXXThisExpr>(BaseExpr)) {
+ QualType ClassTy = ThisExpr->getType();
+ ClassTy = ClassTy->getPointeeType();
+ CXXRecordDecl *ClassDecl =
+ cast<CXXRecordDecl>(ClassTy->getAsRecordType()->getDecl());
+ FieldDecl *Field = dyn_cast<FieldDecl>(E->getMemberDecl());
+ CXXRecordDecl *BaseClassDecl =
+ cast<CXXRecordDecl>(Field->getDeclContext());
+ BaseValue = AddressCXXOfBaseClass(BaseValue, ClassDecl, BaseClassDecl);
+ }
} else if (isa<ObjCPropertyRefExpr>(BaseExpr) ||
isa<ObjCKVCRefExpr>(BaseExpr)) {
RValue RV = EmitObjCPropertyGet(BaseExpr);