diff options
author | John McCall <rjmccall@apple.com> | 2010-12-01 04:43:34 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2010-12-01 04:43:34 +0000 |
commit | 0ae287a498b8cec2086fe6b7e753cbb3df63e74a (patch) | |
tree | 22c868a442c3e824b29d555680ef1f86e13b5ee3 /lib/CodeGen/CGExprScalar.cpp | |
parent | bb3f9952842f4efa663303b0fd1e23a04a0ad082 (diff) |
Restore the lvalue-to-rvalue conversion patch with a minimal fix.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@120555 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprScalar.cpp')
-rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index e5ea26c24b..a46afe6f65 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -1101,6 +1101,10 @@ Value *ScalarExprEmitter::EmitCastExpr(CastExpr *CE) { case CK_ToUnion: llvm_unreachable("scalar cast to non-scalar value"); break; + + case CK_LValueToRValue: + assert(CGF.getContext().hasSameUnqualifiedType(E->getType(), DestTy)); + return Visit(const_cast<Expr*>(E)); case CK_IntegralToPointer: { Value *Src = Visit(const_cast<Expr*>(E)); |