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

Assemble array dimensions recursively (ROOT-7016).

Browse Source
This commit is contained in:
Axel Naumann 2017-05-05 11:54:37 +02:00 committed by sftnight
parent 6296dd2bc4
commit 871b304f8c
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Interpreter/ValuePrinter.cpp
View File

@ -80,6 +80,19 @@ static std::string enclose(const clang::QualType& Ty, clang::ASTContext& C,
Begin, End, Hint);
}
static clang::QualType
getElementTypeAndExtent(const clang::ConstantArrayType *CArrTy,
std::string& extent) {
clang::QualType ElementTy = CArrTy->getElementType();
const llvm::APInt &APSize = CArrTy->getSize();
extent += '[' + std::to_string(APSize.getZExtValue()) + ']';
if (auto CArrElTy
= llvm::dyn_cast<clang::ConstantArrayType>(ElementTy.getTypePtr())) {
return getElementTypeAndExtent(CArrElTy, extent);
}
return ElementTy;
}
static std::string getTypeString(const Value &V) {
clang::ASTContext &C = V.getASTContext();
clang::QualType Ty = V.getType().getDesugaredType(C).getNonReferenceType();
@ -96,15 +109,11 @@ static std::string getTypeString(const Value &V) {
return "(const void**)";
}
if (Ty->isArrayType()) {
const clang::ArrayType *ArrTy = Ty->getAsArrayTypeUnsafe();
clang::QualType ElementTy = ArrTy->getElementType();
if (Ty->isConstantArrayType()) {
const clang::ConstantArrayType *CArrTy = C.getAsConstantArrayType(Ty);
const llvm::APInt &APSize = CArrTy->getSize();
// typeWithOptDeref example for int[40] array: "((int(*)[40])*(void**)0x5c8f260)"
return enclose(ElementTy, C, "(", "(*)[", 5) +
std::to_string(APSize.getZExtValue()) + "])*(void**)";
std::string extent("(*)");
clang::QualType InnermostElTy
= getElementTypeAndExtent(C.getAsConstantArrayType(Ty), extent);
return enclose(InnermostElTy, C, "(", (extent + ")*(void**)").c_str());
}
return "(void**)";
}