Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cling] Ensure correct template argument printing for large integers #17867

Closed
wants to merge 3 commits into from
+13 −7
Closed

[cling] Ensure correct template argument printing for large integers #17867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02fd55a
[cling] Ensure correct template argument printing for large integers
devajithvs Mar 3, 2025
28a9ef5
Revert "Improve int literal printing for template args. To be upstrea…
devajithvs Feb 27, 2025
70787ce
[cling][FIXME:REWORK] Use `AlwaysIncludeTypeForTemplateArgument` only…
devajithvs Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions interpreter/cling/lib/Utils/AST.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,18 @@ namespace utils {
ASTContext &mutableCtx( const_cast<ASTContext&>(Ctx) );
arg = TemplateArgument::CreatePackCopy(mutableCtx, desArgs);
}
} else if (arg.getKind() == TemplateArgument::Integral) {

const llvm::APSInt &Val = arg.getAsIntegral();
QualType T = arg.getIntegralType();

// Handle cases where the value is too large to fit into the underlying type
// i.e. where the unsignedness matters.
if (T->isBuiltinType()) {
if (Val.isUnsigned() && Val.getBitWidth() == 64 && Val.countLeadingOnes()) {
const_cast<clang::PrintingPolicy &>(Ctx.getPrintingPolicy()).AlwaysIncludeTypeForTemplateArgument = true;
}
}
}
return changed;
}
Expand Down
8 changes: 1 addition & 7 deletions interpreter/llvm-project/clang/lib/AST/TemplateBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,8 @@ static void printIntegral(const TemplateArgument &TemplArg, raw_ostream &Out,
} else
Out << "(" << T->getCanonicalTypeInternal().getAsString(Policy) << ")"
<< Val;
} else {
} else
Out << Val;
// Handle cases where the value is too large to fit into the underlying type
// i.e. where the unsignedness matters.
if (T->isBuiltinType())
if (Val.isUnsigned() && Val.getBitWidth() == 64 && Val.countLeadingOnes())
Out << "ull";
}
}

static unsigned getArrayDepth(QualType type) {
Expand Down
Loading