Fix up constant expression handling to deal with the address
of a reference correctly.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72463 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 0df03ec..b30bafb 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -478,21 +478,9 @@
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) {