commit 0ae287a498b8cec2086fe6b7e753cbb3df63e74a
author John McCall <rjmccall@apple.com> Wed Dec 01 04:43:34 2010 +0000
committer John McCall <rjmccall@apple.com> Wed Dec 01 04:43:34 2010 +0000
tree 22c868a442c3e824b29d555680ef1f86e13b5ee3
parent bb3f9952842f4efa663303b0fd1e23a04a0ad082

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

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index ce25b7f..466f55f 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1789,8 +1789,7 @@
     llvm_unreachable("dependent cast kind in IR gen!");
 
   case CK_NoOp:
-    if (E->getSubExpr()->Classify(getContext()).getKind() 
-                                          != Expr::Classification::CL_PRValue) {
+    if (!E->getSubExpr()->isRValue() || E->getType()->isRecordType()) {
       LValue LV = EmitLValue(E->getSubExpr());
       if (LV.isPropertyRef() || LV.isKVCRef()) {
         QualType QT = E->getSubExpr()->getType();
@@ -1805,6 +1804,7 @@
     }
     // Fall through to synthesize a temporary.
 
+  case CK_LValueToRValue:
   case CK_BitCast:
   case CK_ArrayToPointerDecay:
   case CK_FunctionToPointerDecay: