diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-10-25 14:32:25 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-10-25 14:32:25 +0000 |
| commit | 9a8f13961cc6fc9471ff9c916c7576c0bc13de39 (patch) | |
| tree | 05e45eb81660bf306a4b068e96d69c5dff21de5c /clang/lib/CodeGen/CGExprScalar.cpp | |
| parent | 6ca458e49a3addfa7436a0c02e2a84c4a174f13a (diff) | |
| download | bcm5719-llvm-9a8f13961cc6fc9471ff9c916c7576c0bc13de39.tar.gz bcm5719-llvm-9a8f13961cc6fc9471ff9c916c7576c0bc13de39.zip | |
Revert r142914 and r142915, due to possibly missing file.
r142914: "Introduce a placeholder type for "pseudo object""
r142915: "Pull the pseudo-object stuff into its own file."
llvm-svn: 142921
Diffstat (limited to 'clang/lib/CodeGen/CGExprScalar.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 582d1c45722..b088103aa35 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/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"); - LValue LV = CGF.EmitObjCPropertyRefLValue(E->getObjCProperty()); - RValue RV = CGF.EmitLoadOfPropertyRefLValue(LV); + RValue RV = CGF.EmitLoadOfLValue(CGF.EmitLValue(E)); return RV.getScalarVal(); } |
