gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass lvalues like declRefExpr as references into the cling::Value (ROOT-6107).

Browse Source 
This restores ReturnSynthesizer's behavior for ValueExtractionSynthesizer.
This commit is contained in:
Axel Naumann 2014-02-25 16:22:30 +01:00 committed by sftnight
parent 9b678f2829
commit 68d1b137b5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Interpreter/ValueExtractionSynthesizer.cpp
View File

@ -180,6 +180,17 @@ namespace cling {
= m_Sema->BuildDeclRefExpr(FD->getParamDecl(0), m_Context->VoidPtrTy, = m_Sema->BuildDeclRefExpr(FD->getParamDecl(0), m_Context->VoidPtrTy,
VK_RValue, E->getLocStart()); VK_RValue, E->getLocStart());
QualType ETy = E->getType(); QualType ETy = E->getType();
QualType desugaredTy = ETy.getDesugaredType(*m_Context);
// The expr result is transported as reference, pointer, array, float etc
// based on the desugared type. We should still expose the typedef'ed
// (sugared) type to the cling::Value.
if (desugaredTy->isRecordType() && !isa<ExprWithCleanups>(E)) {
// returning a lvalue (not a temporary): the value should contain
// a reference to the lvalue instead of copying it.
desugaredTy = m_Context->getLValueReferenceType(desugaredTy);
ETy = m_Context->getLValueReferenceType(ETy);
}
Expr* ETyVP Expr* ETyVP
= utils::Synthesize::CStyleCastPtrExpr(m_Sema, m_Context->VoidPtrTy, = utils::Synthesize::CStyleCastPtrExpr(m_Sema, m_Context->VoidPtrTy,
(uint64_t)ETy.getAsOpaquePtr()); (uint64_t)ETy.getAsOpaquePtr());
@ -191,7 +202,6 @@ namespace cling {
ExprResult Call; ExprResult Call;
SourceLocation noLoc; SourceLocation noLoc;
const Type* desugaredTy = ETy->getUnqualifiedDesugaredType();
if (desugaredTy->isRecordType() || desugaredTy->isConstantArrayType()) { if (desugaredTy->isRecordType() || desugaredTy->isConstantArrayType()) {
// 2) object types : // 2) object types :
// call new (setValueWithAlloc(gCling, &SVR, ETy)) (E) // call new (setValueWithAlloc(gCling, &SVR, ETy)) (E)
@ -200,7 +210,7 @@ namespace cling {
E->getLocEnd()); E->getLocEnd());
Expr* placement = Call.take(); Expr* placement = Call.take();
if (const ConstantArrayType* constArray if (const ConstantArrayType* constArray
= dyn_cast<ConstantArrayType>(desugaredTy)) { = dyn_cast<ConstantArrayType>(desugaredTy.getTypePtr())) {
CallArgs.clear(); CallArgs.clear();
CallArgs.push_back(E); CallArgs.push_back(E);
CallArgs.push_back(placement); CallArgs.push_back(placement);