From 1e5dc6e12ccda4e783c67fa9ae11be419d7b0573 Mon Sep 17 00:00:00 2001 From: Anders Carlsson <andersca@mac.com> Date: Sat, 11 Apr 2009 01:08:03 +0000 Subject: [PATCH] Add support for generating reference initialization code. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68852 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExprConstant.cpp | 23 +++++++++++++++++++++-- test/CodeGenCXX/const-init.cpp | 11 +++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 test/CodeGenCXX/const-init.cpp diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp index a3fca20f4f..2373ad64e9 100644 --- a/lib/CodeGen/CGExprConstant.cpp +++ b/lib/CodeGen/CGExprConstant.cpp @@ -474,7 +474,26 @@ llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E, CodeGenFunction *CGF) { Expr::EvalResult Result; - if (E->Evaluate(Result, Context)) { + 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 + Success = E->Evaluate(Result, Context); + + if (Success) { assert(!Result.HasSideEffects && "Constant expr should not have any side effects!"); switch (Result.Val.getKind()) { @@ -482,7 +501,7 @@ llvm::Constant *CodeGenModule::EmitConstantExpr(const Expr *E, assert(0 && "Constant expressions should be initialized."); return 0; case APValue::LValue: { - const llvm::Type *DestTy = getTypes().ConvertTypeForMem(E->getType()); + const llvm::Type *DestTy = getTypes().ConvertTypeForMem(DestType); llvm::Constant *Offset = llvm::ConstantInt::get(llvm::Type::Int64Ty, Result.Val.getLValueOffset()); diff --git a/test/CodeGenCXX/const-init.cpp b/test/CodeGenCXX/const-init.cpp new file mode 100644 index 0000000000..427ba53729 --- /dev/null +++ b/test/CodeGenCXX/const-init.cpp @@ -0,0 +1,11 @@ +// RUN: clang-cc -verify -emit-llvm -o %t %s + +int a = 10; +int &ar = a; + +void f(); +void (&fr)() = f; + +struct S { int& a; }; +S s = { a }; + -- 2.40.0