diff options
Diffstat (limited to 'clang/lib/CodeGen/CGExprCXX.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprCXX.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp index 9a98281771f..acdbe065561 100644 --- a/clang/lib/CodeGen/CGExprCXX.cpp +++ b/clang/lib/CodeGen/CGExprCXX.cpp @@ -100,7 +100,15 @@ RValue CodeGenFunction::EmitCXXMemberCallExpr(const CXXMemberCallExpr *CE, This = EmitScalarExpr(ME->getBase()); else { LValue BaseLV = EmitLValue(ME->getBase()); - This = BaseLV.getAddress(); + if (BaseLV.isPropertyRef() || BaseLV.isKVCRef()) { + QualType QT = ME->getBase()->getType(); + RValue RV = + BaseLV.isPropertyRef() ? EmitLoadOfPropertyRefLValue(BaseLV, QT) + : EmitLoadOfKVCRefLValue(BaseLV, QT); + This = RV.isScalar() ? RV.getScalarVal() : RV.getAggregateAddr(); + } + else + This = BaseLV.getAddress(); } if (MD->isTrivial()) { |
