1 files changed, 3 insertions, 15 deletions
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 0df03ec3a2..b30bafb510 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -478,21 +478,9 @@ llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E,
   
   bool Success = false;
   
-  if (DestType->isReferenceType()) {
-    // If the destination type is a reference type, we need to evaluate it
-    // as an lvalue.
-    if (E->EvaluateAsLValue(Result, Context)) {
-      if (const Expr *LVBase = Result.Val.getLValueBase()) {
-        if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(LVBase)) {
-          const ValueDecl *VD = cast<ValueDecl>(DRE->getDecl());
-
-          // We can only initialize a reference with an lvalue if the lvalue
-          // is not a reference itself.
-          Success = !VD->getType()->isReferenceType();
-        }
-      }
-    }
-  } else 
+  if (DestType->isReferenceType())
+    Success = E->EvaluateAsLValue(Result, Context);
+  else 
     Success = E->Evaluate(Result, Context);
   
   if (Success) {