diff options
| author | John McCall <rjmccall@apple.com> | 2011-10-25 17:37:35 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-10-25 17:37:35 +0000 |
| commit | 3c3b7f90a863af43fa63043d396553ecf205351c (patch) | |
| tree | 0bf73812c898572adb7e3f2e6ebbe2d62f60612d /lib/CodeGen/CGExprScalar.cpp | |
| parent | edae1a2fc81982b87207cd0b385ee7a9c8ce426b (diff) | |
Restore r142914 and r142915, now with missing file and apparent
GCC compiler workaround.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142931 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index b088103aa3..582d1c4572 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1167,10 +1167,10 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) { break; case CK_GetObjCProperty: { - assert(CGF.getContext().hasSameUnqualifiedType(E->getType(), DestTy)); assert(E->isGLValue() && E->getObjectKind() == OK_ObjCProperty && "CK_GetObjCProperty for non-lvalue or non-ObjCProperty"); - RValue RV = CGF.EmitLoadOfLValue(CGF.EmitLValue(E)); + LValue LV = CGF.EmitObjCPropertyRefLValue(E->getObjCProperty()); + RValue RV = CGF.EmitLoadOfPropertyRefLValue(LV); return RV.getScalarVal(); } |