diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-09-01 19:36:41 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-09-01 19:36:41 +0000 |
| commit | 61a312413c82aa23ef63467cde87f6de1ce8724f (patch) | |
| tree | 92cb2ca63a66e4d46b7b6b7d9919b2bfb0b8dac2 /clang/lib/CodeGen/CGExpr.cpp | |
| parent | df6b67bf852b6e2a12eb6f0963e85cc96c596fcf (diff) | |
| download | bcm5719-llvm-61a312413c82aa23ef63467cde87f6de1ce8724f.tar.gz bcm5719-llvm-61a312413c82aa23ef63467cde87f6de1ce8724f.zip | |
Fix IRGen when property-dot syntax used to access
a c++ class object 'ivar'. Fixes radar 8366604.
llvm-svn: 112729
Diffstat (limited to 'clang/lib/CodeGen/CGExpr.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExpr.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 1af0d56b448..06c657fa926 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -1753,9 +1753,11 @@ LValue CodeGenFunction::EmitCastLValue(const CastExpr *E) { if (E->getSubExpr()->Classify(getContext()).getKind() != Expr::Classification::CL_PRValue) { LValue LV = EmitLValue(E->getSubExpr()); - if (LV.isPropertyRef()) { + if (LV.isPropertyRef() || LV.isKVCRef()) { QualType QT = E->getSubExpr()->getType(); - RValue RV = EmitLoadOfPropertyRefLValue(LV, QT); + RValue RV = + LV.isPropertyRef() ? EmitLoadOfPropertyRefLValue(LV, QT) + : EmitLoadOfKVCRefLValue(LV, QT); assert(!RV.isScalar() && "EmitCastLValue-scalar cast of property ref"); llvm::Value *V = RV.getAggregateAddr(); return MakeAddrLValue(V, QT); @@ -1810,8 +1812,11 @@ LValue CodeGenFunction::EmitCastLValue(const CastExpr *E) { LValue LV = EmitLValue(E->getSubExpr()); llvm::Value *This; - if (LV.isPropertyRef()) { - RValue RV = EmitLoadOfPropertyRefLValue(LV, E->getSubExpr()->getType()); + if (LV.isPropertyRef() || LV.isKVCRef()) { + QualType QT = E->getSubExpr()->getType(); + RValue RV = + LV.isPropertyRef() ? EmitLoadOfPropertyRefLValue(LV, QT) + : EmitLoadOfKVCRefLValue(LV, QT); assert (!RV.isScalar() && "EmitCastLValue"); This = RV.getAggregateAddr(); } |
