[clang][bytecode] Only print ptr/reference types via toAPValue() #137965
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Otherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values.
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) ChangesOtherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values. Full diff: https://github.com/llvm/llvm-project/pull/137965.diff 2 Files Affected:
diff --git a/clang/lib/AST/ByteCode/InterpFrame.cpp b/clang/lib/AST/ByteCode/InterpFrame.cpp
index 1a6e271c78d6f..e4bd4a6ba7656 100644
--- a/clang/lib/AST/ByteCode/InterpFrame.cpp
+++ b/clang/lib/AST/ByteCode/InterpFrame.cpp
@@ -107,7 +107,18 @@ void InterpFrame::destroy(unsigned Idx) {
template <typename T>
static void print(llvm::raw_ostream &OS, const T &V, ASTContext &ASTCtx,
QualType Ty) {
- V.toAPValue(ASTCtx).printPretty(OS, ASTCtx, Ty);
+ if constexpr (std::is_same_v<Pointer, T>) {
+ if (Ty->isPointerOrReferenceType())
+ V.toAPValue(ASTCtx).printPretty(OS, ASTCtx, Ty);
+ else {
+ if (std::optional<APValue> RValue = V.toRValue(ASTCtx, Ty))
+ RValue->printPretty(OS, ASTCtx, Ty);
+ else
+ OS << "...";
+ }
+ } else {
+ V.toAPValue(ASTCtx).printPretty(OS, ASTCtx, Ty);
+ }
}
static bool shouldSkipInBacktrace(const Function *F) {
diff --git a/clang/test/AST/ByteCode/constexpr-frame-describe.cpp b/clang/test/AST/ByteCode/constexpr-frame-describe.cpp
index d875d8730b7d6..1b19a7af0663b 100644
--- a/clang/test/AST/ByteCode/constexpr-frame-describe.cpp
+++ b/clang/test/AST/ByteCode/constexpr-frame-describe.cpp
@@ -79,8 +79,7 @@ static_assert(bar.fail1<int>()); // both-error {{constant expression}} \
static_assert(bar.fail2<int*, 42>()); // both-error {{constant expression}} \
// both-note {{in call to 'bar.fail2<int *, 42>()'}}
static_assert(bar.fail3(3, 4UL, bar, &bar)); // both-error {{constant expression}} \
- // expected-note {{in call to 'bar.fail3<int, unsigned long, Bar<int>, const Bar<int> *>(3, 4, &bar, &bar)'}} \
- // ref-note {{in call to 'bar.fail3<int, unsigned long, Bar<int>, const Bar<int> *>(3, 4, {}, &bar)'}}
+ // both-note {{in call to 'bar.fail3<int, unsigned long, Bar<int>, const Bar<int> *>(3, 4, {}, &bar)'}}
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/15357 Here is the relevant piece of the build log for the reference |
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…m#137965) Otherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…m#137965) Otherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…m#137965) Otherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values.
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
…m#137965) Otherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise, convert them to an RValue to print them. This fixes the printing of e.g. complex values.